1 files changed, 0 insertions, 13 deletions
diff --git a/bundles/org.eclipse.wst.wsi/plugin.properties b/bundles/org.eclipse.wst.wsi/plugin.properties
deleted file mode 100644
index 2c65e29c7..000000000
--- a/bundles/org.eclipse.wst.wsi/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# /*******************************************************************************
-#  * Copyright (c) 2002-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 - Initial API and implementation
-#  *******************************************************************************/
-_PLUGIN_NAME   = WSI Conformance Tools
-_UI_WSDL_WSI_VALIDATOR = WSDL WS-I Validator
-_PROVIDER_NAME = Eclipse.org
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 f5c957cce..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="3.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/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 9f1d60a54..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.300.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 2199df3f0..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, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor�s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.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 d98679f7f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-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.translation.JSPJavaTranslatorCoreTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPActionValidatorTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPBatchValidatorTest;
-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"));
-		// temporarily removed since unstable, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=213754 
-		// 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"));
-		addTest(new TestSuite(JSPBatchValidatorTest.class, "JSP Batch 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/ManyTestIndex.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ManyTestIndex.java
deleted file mode 100644
index 57f180c84..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ManyTestIndex.java
+++ /dev/null
@@ -1,39 +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.taglibindex.TestIndex;
-
-public class ManyTestIndex extends TestSuite {
-	public static Test suite() {
-		return new ManyTestIndex();
-	}
-
-	public ManyTestIndex() {
-		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");
-
-		for (int i = 0; i < 25; i++) {
-			addTest(new TestSuite(TestIndex.class, "TaglibIndex Tests " + (i + 1)));
-		}
-
-		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/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 ad456c99b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ /dev/null
@@ -1,360 +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 java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.tests.util.StringCompareUtil;
-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.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;
-	private StringCompareUtil fStringCompareUtil;
-
-	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();
-	}
-
-	protected void setUp() throws Exception {
-		fStringCompareUtil = new StringCompareUtil();
-	}
-
-	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("small2.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 = "small2.afterCompressEmptyElementTags-newfmt.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
-				StringWriter s = new StringWriter();
-				exception.printStackTrace(new PrintWriter(s));
-				fail(s.toString());
-			}
-		}
-
-		return structuredModel;
-	}
-
-	protected String getFile(String fileName) throws IOException {
-		return readFile("testfiles/".concat(fileName));
-	}
-
-	protected void compare(String testcaseName, String expected, String cleaned) {
-		assertTrue("Cleaned up document differs from the expected.\nExpected Contents:\n" + expected + "\nActual Contents:\n" + cleaned, fStringCompareUtil.equalsIgnoreLineSeperator(expected, 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 348a3d815..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ /dev/null
@@ -1,586 +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 java.io.PrintWriter;
-import java.io.StringWriter;
-
-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) {
-			StringWriter s = new StringWriter();
-			exception.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-
-		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) {
-			StringWriter s = new StringWriter();
-			exception.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		finally {
-			try {
-				inputStream.close();
-			}
-			catch (Exception exception) {
-				// hopeless
-				StringWriter s = new StringWriter();
-				exception.printStackTrace(new PrintWriter(s));
-				fail(s.toString());
-			}
-		}
-
-		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("=======================================");
-			}
-			assertEquals(expected, formatted);
-		}
-	}
-}
-\ 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/small2.afterCompressEmptyElementTags-newfmt.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.afterCompressEmptyElementTags-newfmt.xml
deleted file mode 100644
index 8a49f9e88..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.afterCompressEmptyElementTags-newfmt.xml
+++ /dev/null
@@ -1,30 +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.metamodel xmi.name="UML" xmi.version="1.1" />
-	</XMI.header>
-	<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/small2.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.xml
deleted file mode 100644
index 7b9be5a14..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small2.xml
+++ /dev/null
@@ -1,32 +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.metamodel xmi.name    =			"UML" xmi.version
-		=
-		"1.1" />
-	</XMI.header>
-
-	<XMI.content>
-	</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 1f679b9c2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contentmodels;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contentmodel.JSPCMDocumentFactory;
-import org.eclipse.wst.html.core.internal.contentmodel.JSP11Namespace;
-import org.eclipse.wst.html.core.internal.contentmodel.JSP20Namespace;
-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);
-	}
-
-	/**
-	 * @param cm_doc_type
-	 * @param elementName
-	 * @param attrNameImport
-	 */
-	private void checkAttrNames(String documentKey, String elementName, String[] attrNames) {
-		CMDocument document = JSPCMDocumentFactory.getCMDocument(documentKey);
-		CMNode elementDeclaration = document.getElements().getNamedItem(elementName);
-		assertEquals("not an element declaration:" + elementDeclaration, CMNode.ELEMENT_DECLARATION, elementDeclaration.getNodeType());
-		assertNotNull("missing element declaration:" + elementName, elementDeclaration);
-		
-		CMNamedNodeMap attributes = ((CMElementDeclaration) elementDeclaration).getAttributes();
-		
-		for (int i = 0; i < attrNames.length; i++) {
-			assertNotNull("missing attribute declaration:" + attrNames[i], attributes.getNamedItem(attrNames[i]));
-		}
-		assertEquals("Attributes defined in content model that are not expected by the test", attributes.getLength(), attrNames.length);
-	}
-
-	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);
-		}
-	}
-
-	public void testAttributesOnJSP11Forward() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.FORWARD, new String[]{JSP11Namespace.ATTR_NAME_PAGE});
-	}
-
-	public void testAttributesOnJSP11GetProperty() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.GETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY});
-	}
-
-	public void testAttributesOnJSP11Include() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_PAGE, JSP11Namespace.ATTR_NAME_FLUSH});
-	}
-
-	public void testAttributesOnJSP11IncludeDirective() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_FILE});
-	}
-
-	public void testAttributesOnJSP11PageDirective() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_PAGE, new String[]{JSP11Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_EXTENDS, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_SESSION, JSP11Namespace.ATTR_NAME_BUFFER, JSP11Namespace.ATTR_NAME_AUTOFLUSH, JSP11Namespace.ATTR_NAME_IS_THREAD_SAFE, JSP11Namespace.ATTR_NAME_INFO, JSP11Namespace.ATTR_NAME_ERROR_PAGE, JSP11Namespace.ATTR_NAME_IS_ERROR_PAGE, JSP11Namespace.ATTR_NAME_CONTENT_TYPE, JSP11Namespace.ATTR_NAME_PAGE_ENCODING});
-	}
-
-	public void testAttributesOnJSP11Param() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.PARAM, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_VALUE});
-	}
-
-	public void testAttributesOnJSP11Plugin() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.PLUGIN, new String[]{JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_CODE, JSP11Namespace.ATTR_NAME_CODEBASE, JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_ARCHIVE, JSP11Namespace.ATTR_NAME_ALIGN, JSP11Namespace.ATTR_NAME_HEIGHT, JSP11Namespace.ATTR_NAME_WIDTH, JSP11Namespace.ATTR_NAME_HSPACE, JSP11Namespace.ATTR_NAME_VSPACE, JSP11Namespace.ATTR_NAME_JREVERSION, JSP11Namespace.ATTR_NAME_NSPLUGINURL, JSP11Namespace.ATTR_NAME_IEPLUGINURL});
-	}
-
-	public void testAttributesOnJSP11Root() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.ROOT, new String[]{JSP11Namespace.ATTR_NAME_XMLNS_JSP, JSP11Namespace.ATTR_NAME_VERSION});
-	}
-	
-//	public void testAttributesOnJSP21PageDirective() {
-//		checkAttrNames(CMDocType.JSP21_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_PAGE, new String[]{JSP11Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_EXTENDS, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_SESSION, JSP11Namespace.ATTR_NAME_BUFFER, JSP11Namespace.ATTR_NAME_AUTOFLUSH, JSP11Namespace.ATTR_NAME_IS_THREAD_SAFE, JSP11Namespace.ATTR_NAME_INFO, JSP11Namespace.ATTR_NAME_ERROR_PAGE, JSP11Namespace.ATTR_NAME_IS_ERROR_PAGE, JSP11Namespace.ATTR_NAME_CONTENT_TYPE, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_DEFERRED_SYNTAX_ALLOWED_AS_LITERAL, JSP20Namespace.ATTR_NAME_TRIM_DIRECTIVE_WHITESPACES, JSP20Namespace.ATTR_NAME_ISELIGNORED});
-//	}
-
-	public void testAttributesOnJSP11SetProperty() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.SETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY, JSP11Namespace.ATTR_NAME_PARAM, JSP11Namespace.ATTR_NAME_VALUE});
-	}
-
-	public void testAttributesOnJSP11TaglibDirective() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_TAGLIB, new String[]{JSP11Namespace.ATTR_NAME_URI, JSP11Namespace.ATTR_NAME_PREFIX});
-	}
-
-	public void testAttributesOnJSP11UseBean() {
-		checkAttrNames(CMDocType.JSP11_DOC_TYPE, JSP11Namespace.ElementName.USEBEAN, new String[]{JSP11Namespace.ATTR_NAME_ID, JSP11Namespace.ATTR_NAME_SCOPE, JSP11Namespace.ATTR_NAME_CLASS, JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_BEAN_NAME});
-	}
-
-	public void testAttributesOnJSP20Attribute() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP20Namespace.ElementName.ATTRIBUTE, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP20Namespace.ATTR_NAME_TRIM});
-	}
-
-	public void testAttributesOnJSP20Element() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP20Namespace.ElementName.ELEMENT, new String[]{JSP11Namespace.ATTR_NAME_NAME});
-	}
-
-
-	public void testAttributesOnJSP20Forward() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.FORWARD, new String[]{JSP11Namespace.ATTR_NAME_PAGE});
-	}
-	
-	public void testAttributesOnJSP20GetProperty() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.GETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY});
-	}
-
-	// JSP 2.1 attributes on tag directives
-//	public void testAttributesOnTAG21TagDirective() {
-//		checkAttrNames(CMDocType.TAG21_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_TAG, new String[]{JSP20Namespace.ATTR_NAME_DISPLAY_NAME, JSP20Namespace.ATTR_NAME_BODY_CONTENT, JSP20Namespace.ATTR_NAME_DYNAMIC_ATTRIBUTES, JSP20Namespace.ATTR_NAME_SMALL_ICON, JSP20Namespace.ATTR_NAME_LARGE_ICON, JSP20Namespace.ATTR_NAME_DESCRIPTION, JSP20Namespace.ATTR_NAME_EXAMPLE, JSP20Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_ISELIGNORED, JSP20Namespace.ATTR_NAME_DEFERRED_SYNTAX_ALLOWED_AS_LITERAL, JSP20Namespace.ATTR_NAME_TRIM_DIRECTIVE_WHITESPACES});
-//	}
-
-	public void testAttributesOnJSP20Include() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_PAGE, JSP11Namespace.ATTR_NAME_FLUSH});
-	}
-	
-	public void testAttributesOnJSP20IncludeDirective() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_FILE});
-	}
-	
-	public void testAttributesOnJSP20Output() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP20Namespace.ElementName.OUTPUT, new String[]{JSP20Namespace.ATTR_NAME_OMIT_XML_DECL, JSP20Namespace.ATTR_NAME_DOCTYPE_PUBLIC, JSP20Namespace.ATTR_NAME_DOCTYPE_ROOT_ELEMENT, JSP20Namespace.ATTR_NAME_DOCTYPE_SYSTEM});
-	}
-	
-	public void testAttributesOnJSP20PageDirective() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_PAGE, new String[]{JSP11Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_EXTENDS, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_SESSION, JSP11Namespace.ATTR_NAME_BUFFER, JSP11Namespace.ATTR_NAME_AUTOFLUSH, JSP11Namespace.ATTR_NAME_IS_THREAD_SAFE, JSP11Namespace.ATTR_NAME_INFO, JSP11Namespace.ATTR_NAME_ERROR_PAGE, JSP11Namespace.ATTR_NAME_IS_ERROR_PAGE, JSP11Namespace.ATTR_NAME_CONTENT_TYPE, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_ISELIGNORED});
-	}
-	
-	public void testAttributesOnJSP20Param() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.PARAM, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_VALUE});
-	}
-	
-	public void testAttributesOnJSP20Plugin() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.PLUGIN, new String[]{JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_CODE, JSP11Namespace.ATTR_NAME_CODEBASE, JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_ARCHIVE, JSP11Namespace.ATTR_NAME_ALIGN, JSP11Namespace.ATTR_NAME_HEIGHT, JSP11Namespace.ATTR_NAME_WIDTH, JSP11Namespace.ATTR_NAME_HSPACE, JSP11Namespace.ATTR_NAME_VSPACE, JSP11Namespace.ATTR_NAME_JREVERSION, JSP11Namespace.ATTR_NAME_NSPLUGINURL, JSP11Namespace.ATTR_NAME_IEPLUGINURL, JSP20Namespace.ATTR_NAME_MAYSCRIPT});
-	}
-	
-	public void testAttributesOnJSP20Root() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.ROOT, new String[]{JSP11Namespace.ATTR_NAME_XMLNS_JSP, JSP11Namespace.ATTR_NAME_VERSION});
-	}
-	
-	public void testAttributesOnJSP20SetProperty() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.SETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY, JSP11Namespace.ATTR_NAME_PARAM, JSP11Namespace.ATTR_NAME_VALUE});
-	}
-	
-	public void testAttributesOnJSP20TaglibDirective() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_TAGLIB, new String[]{JSP11Namespace.ATTR_NAME_URI, JSP11Namespace.ATTR_NAME_PREFIX, JSP20Namespace.ATTR_NAME_TAGDIR});
-	}
-	
-	public void testAttributesOnJSP20UseBean() {
-		checkAttrNames(CMDocType.JSP20_DOC_TYPE, JSP11Namespace.ElementName.USEBEAN, new String[]{JSP11Namespace.ATTR_NAME_ID, JSP11Namespace.ATTR_NAME_SCOPE, JSP11Namespace.ATTR_NAME_CLASS, JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_BEAN_NAME});
-	}
-	
-	public void testAttributesOnTAG20Attribute() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.ATTRIBUTE, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP20Namespace.ATTR_NAME_TRIM});
-	}
-	
-	public void testAttributesOnTAG20AttributeDirective() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_ATTRIBUTE, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP20Namespace.ATTR_NAME_REQUIRED, JSP20Namespace.ATTR_NAME_FRAGMENT, JSP20Namespace.ATTR_NAME_RTEXPRVALUE, JSP20Namespace.ATTR_NAME_TYPE, JSP20Namespace.ATTR_NAME_DESCRIPTION});
-	}
-	
-	public void testAttributesOnTAG20DoBody() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DOBODY, new String[]{JSP20Namespace.ATTR_NAME_VAR, JSP20Namespace.ATTR_NAME_VARREADER, JSP11Namespace.ATTR_NAME_SCOPE});
-	}
-	
-	public void testAttributesOnTAG20Element() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.ELEMENT, new String[]{JSP11Namespace.ATTR_NAME_NAME});
-	}
-	
-	public void testAttributesOnTAG20Forward() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.FORWARD, new String[]{JSP11Namespace.ATTR_NAME_PAGE});
-	}
-	
-	public void testAttributesOnTAG20GetProperty() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.GETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY});
-	}
-	
-	public void testAttributesOnTAG20Include() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_PAGE, JSP11Namespace.ATTR_NAME_FLUSH});
-	}
-	
-	public void testAttributesOnTAG20IncludeDirective() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_INCLUDE, new String[]{JSP11Namespace.ATTR_NAME_FILE});
-	}
-	
-	public void testAttributesOnTAG20Invoke() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.INVOKE, new String[]{JSP20Namespace.ATTR_NAME_FRAGMENT, JSP20Namespace.ATTR_NAME_VAR, JSP20Namespace.ATTR_NAME_VARREADER, JSP11Namespace.ATTR_NAME_SCOPE});
-	}
-	
-	public void testAttributesOnTAG20Output() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.OUTPUT, new String[]{JSP20Namespace.ATTR_NAME_OMIT_XML_DECL, JSP20Namespace.ATTR_NAME_DOCTYPE_PUBLIC, JSP20Namespace.ATTR_NAME_DOCTYPE_ROOT_ELEMENT, JSP20Namespace.ATTR_NAME_DOCTYPE_SYSTEM});
-	}
-	
-	public void testAttributesOnTAG20Param() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.PARAM, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_VALUE});
-	}
-	
-	public void testAttributesOnTAG20Plugin() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.PLUGIN, new String[]{JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_CODE, JSP11Namespace.ATTR_NAME_CODEBASE, JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_ARCHIVE, JSP11Namespace.ATTR_NAME_ALIGN, JSP11Namespace.ATTR_NAME_HEIGHT, JSP11Namespace.ATTR_NAME_WIDTH, JSP11Namespace.ATTR_NAME_HSPACE, JSP11Namespace.ATTR_NAME_VSPACE, JSP11Namespace.ATTR_NAME_JREVERSION, JSP11Namespace.ATTR_NAME_NSPLUGINURL, JSP11Namespace.ATTR_NAME_IEPLUGINURL, JSP20Namespace.ATTR_NAME_MAYSCRIPT});
-	}
-	
-	public void testAttributesOnTAG20Root() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.ROOT, new String[]{JSP11Namespace.ATTR_NAME_XMLNS_JSP, JSP11Namespace.ATTR_NAME_VERSION});
-	}
-	
-	public void testAttributesOnTAG20SetProperty() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.SETPROPERTY, new String[]{JSP11Namespace.ATTR_NAME_NAME, JSP11Namespace.ATTR_NAME_PROPERTY, JSP11Namespace.ATTR_NAME_PARAM, JSP11Namespace.ATTR_NAME_VALUE});
-	}
-	
-	public void testAttributesOnTAG20TagDirective() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_TAG, new String[]{JSP20Namespace.ATTR_NAME_DISPLAY_NAME, JSP20Namespace.ATTR_NAME_BODY_CONTENT, JSP20Namespace.ATTR_NAME_DYNAMIC_ATTRIBUTES, JSP20Namespace.ATTR_NAME_SMALL_ICON, JSP20Namespace.ATTR_NAME_LARGE_ICON, JSP20Namespace.ATTR_NAME_DESCRIPTION, JSP20Namespace.ATTR_NAME_EXAMPLE, JSP20Namespace.ATTR_NAME_LANGUAGE, JSP11Namespace.ATTR_NAME_IMPORT, JSP11Namespace.ATTR_NAME_PAGE_ENCODING, JSP20Namespace.ATTR_NAME_ISELIGNORED});
-	}
-	
-	public void testAttributesOnTAG20TaglibDirective() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.DIRECTIVE_TAGLIB, new String[]{JSP11Namespace.ATTR_NAME_URI, JSP11Namespace.ATTR_NAME_PREFIX, JSP20Namespace.ATTR_NAME_TAGDIR});
-	}
-	
-	public void testAttributesOnTAG20UseBean() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP11Namespace.ElementName.USEBEAN, new String[]{JSP11Namespace.ATTR_NAME_ID, JSP11Namespace.ATTR_NAME_SCOPE, JSP11Namespace.ATTR_NAME_CLASS, JSP11Namespace.ATTR_NAME_TYPE, JSP11Namespace.ATTR_NAME_BEAN_NAME});
-	}
-	
-	public void testAttributesOnTAG20VariableDirective() {
-		checkAttrNames(CMDocType.TAG20_DOC_TYPE, JSP20Namespace.ElementName.DIRECTIVE_VARIABLE, new String[]{JSP20Namespace.ATTR_NAME_NAME_GIVEN, JSP20Namespace.ATTR_NAME_NAME_FROM_ATTRIBUTE, JSP20Namespace.ATTR_NAME_ALIAS, JSP20Namespace.ATTR_NAME_VARIABLE_CLASS, JSP20Namespace.ATTR_NAME_DECLARE, JSP11Namespace.ATTR_NAME_SCOPE, JSP20Namespace.ATTR_NAME_DESCRIPTION});
-	}
-	
-	public void testCHTMLdocument() {
-		checkDocument(CMDocType.CHTML_DOC_TYPE);
-	}
-	
-	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);
-	}
-	
-	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());
-	}
-
-	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);
-		}
-	}
-}
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 557a1e444..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
+++ /dev/null
@@ -1,137 +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"));
-		assertTrue("test file " + jspFile.getFullPath() + " does not exist", jspFile.exists());
-
-		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", TAG_NAME, declaration.getNodeName());
-		}
-		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"));
-		assertTrue("test file " + jspFile.getFullPath() + " does not exist", jspFile.exists());
-
-		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 CMElementDeclaration for " + TAG_NAME, declaration);
-			assertEquals("qualified name from element declaration was different", TAG_NAME, declaration.getNodeName());
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-	
-	public void testTagFileReferencedInTLD() throws IOException, CoreException {
-		String DPROJECT_NAME = "DynamicWebProject";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(DPROJECT_NAME);
-		if (!project.exists()) {
-			// Create new project
-			project = BundleResourceUtil.createSimpleProject(DPROJECT_NAME, null, null);
-			BundleResourceUtil.copyBundleZippedEntriesIntoWorkspace("/testfiles/jspErrorProject.zip", Path.ROOT);
-		}
-		project.refreshLocal(IResource.DEPTH_INFINITE, null);
-
-		IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append("DynamicWebProject/WebContent/index.jsp"));
-		assertTrue("test file " + jspFile.getFullPath() + " does not exist", jspFile.exists());
-
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
-			String DTAGNAME = "date:returndate";
-			NodeList returnDates = model.getDocument().getElementsByTagName(DTAGNAME);
-			assertNotNull("date:returndate was missing from document", returnDates.item(0));
-			ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) returnDates.item(0)).getAdapterFor(ModelQueryAdapter.class);
-			CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) returnDates.item(0));
-			assertNotNull("no CMElementDeclaration for date:returndate", declaration);
-			assertEquals("qualified name from element declaration was different", DTAGNAME, declaration.getNodeName());
-		}
-		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 cfb55d55c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
+++ /dev/null
@@ -1,198 +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.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-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.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-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());
-	}
-
-	public void testDirtyStateForEmbeddedContentTypeTextHTML() throws Exception {
-		String name = "bug243243";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(name, null, null);
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
-		}
-		IFile testFile = project.getFile("html.jsp");
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-		assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
-		model.releaseFromRead();
-		project.delete(true, null);
-	}
-
-	public void testDirtyStateForEmbeddedContentTypeTextCSS() throws Exception {
-		String name = "bug243243";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(name, null, null);
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
-		}
-		IFile testFile = project.getFile("css.jsp");
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-		assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
-		model.releaseFromRead();
-		project.delete(true, null);
-	}
-	
-	public void testDirtyStateForEmbeddedContentTypeTextXML() throws Exception {
-		String name = "bug243243";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(name, null, null);
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
-		}
-		IFile testFile = project.getFile("xml.jsp");
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-		assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
-		model.releaseFromRead();
-		project.delete(true, null);
-	}
-
-	public void testDirtyStateForEmbeddedContentTypeSubXML() throws Exception {
-		String name = "bug243243";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(name, null, null);
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
-		}
-		IFile testFile = project.getFile("rdf.jsp");
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-		assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
-		model.releaseFromRead();
-		project.delete(true, null);
-	}
-
-	public void testDirtyStateForDefaultEmbeddedContentType() throws Exception {
-		String name = "bug243243";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(name, null, null);
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
-		}
-		IFile testFile = project.getFile("default.jsp");
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-		assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
-		model.releaseFromRead();
-		project.delete(true, null);
-	}
-
-	public void testDirtyStateWithNoPageDirective() throws Exception {
-		String name = "bug243243";
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (!project.isAccessible()) {
-			project = BundleResourceUtil.createSimpleProject(name, null, null);
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug243243", "/bug243243");
-		}
-		IFile testFile = project.getFile("nodirective.jsp");
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(testFile);
-		assertFalse("newly opened model was dirty " + testFile.getName(), model.isDirty());
-		model.releaseFromRead();
-		project.delete(true, null);
-	}
-}
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 cca9267dc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
+++ /dev/null
@@ -1,162 +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.io.PrintWriter;
-import java.io.StringWriter;
-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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		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) {
-				StringWriter s = new StringWriter();
-				e.printStackTrace(new PrintWriter(s));
-				fail(s.toString());
-			}
-			catch (CoreException e) {
-				StringWriter s = new StringWriter();
-				e.printStackTrace(new PrintWriter(s));
-				fail(s.toString());
-			}
-		}
-		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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		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 ba8e2a6bf..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
+++ /dev/null
@@ -1,159 +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.PrintWriter;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.parser.internal.JSPTokenizer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-	}
-
-	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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-	}
-
-	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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-	}
-
-	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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		catch (StackOverflowError e) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		// success if StackOverFlowError does not occur with tokenizer.
-		assertTrue(true);
-	}
-	
-	public void test26004() {
-		String input = "<c:set var=\"foo\" value=\"${foo} bar #\" /> <div id=\"container\" >Test</div>";
-		try {
-			reset(new StringReader(input));
-			ITextRegion region = tokenizer.getNextToken();
-			assertTrue("empty input", region != null);
-			while (region != null) {
-				if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-					region = tokenizer.getNextToken();
-					assertNotNull("document consumed by trailing $ or #", region);
-				}
-				else
-					region = tokenizer.getNextToken();
-			}
-		}
-		catch (IOException e) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-	}
-}
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 c3f557376..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
+++ /dev/null
@@ -1,267 +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 java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-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.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-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 Exception {
-		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 Exception {
-		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);
-			// }
-			// }
-			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());
-				}
-			}
-		}
-		else {
-			System.err.println("can't find " + entryname);
-		}
-		return file;
-	}
-
-	public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws Exception {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				try {
-					_copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
-				}
-				catch (Exception e) {
-					throw new CoreException(new Status(IStatus.ERROR, JSPCoreTestsPlugin.getDefault().getBundle().getSymbolicName(), 0, null, e));
-				}
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-	}
-
-	public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) throws Exception {
-		final IFile file[] = new IFile[1];
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				try {
-					file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
-				}
-				catch (Exception e) {
-					throw new CoreException(new Status(IStatus.ERROR, JSPCoreTestsPlugin.getDefault().getBundle().getSymbolicName(), 0, null, e));
-				}
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-		return file[0];
-	}
-
-	public static void copyBundleZippedEntriesIntoWorkspace(final String zipFileEntry, final IPath fullTargetPath) throws CoreException {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				IFile file = null;
-				URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(zipFileEntry);
-				if (entry != null) {
-					try {
-						byte[] b = new byte[2048];
-						ZipInputStream input = new ZipInputStream(entry.openStream());
-
-						ZipEntry nextEntry = input.getNextEntry();
-						while (nextEntry != null) {
-							IPath path = fullTargetPath.append(nextEntry.getName());
-
-							if (nextEntry.isDirectory()) {
-								IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
-								if (!folder.exists()) {
-									folder.create(true, true, null);
-								}
-							}
-							else {
-								IPath folderPath = path.removeLastSegments(1);
-								for (int i = folderPath.segmentCount(); i > 0; i--) {
-									IPath parentFolderPath = path.removeLastSegments(i);
-									if (parentFolderPath.segmentCount() > 1) {
-										IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(parentFolderPath);
-										if (!folder.exists()) {
-											folder.create(true, true, null);
-										}
-									}
-								}
-								file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-								ByteArrayOutputStream output = new ByteArrayOutputStream();
-								int i = -1;
-								while ((i = input.read(b)) > -1) {
-									output.write(b, 0, i);
-								}
-								if (!file.exists()) {
-									file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
-								}
-								else {
-									file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
-								}
-							}
-							ResourcesPlugin.getWorkspace().checkpoint(true);
-							nextEntry = input.getNextEntry();
-						}
-					}
-					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 " + zipFileEntry);
-				}
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-	}
-
-	/**
-	 * 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 ddde55557..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
+++ /dev/null
@@ -1,484 +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.internal.resources.ResourceException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-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;
-	int MAX_RETRYS = 5;
-	int PAUSE_TIME = 1;
-	boolean DEBUG = true;
-
-	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);
-		removeAllProjects();
-	}
-
-	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.isAccessible());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testavailable1", "/testavailable1");
-
-		// Create project 2
-		IProject project2 = BundleResourceUtil.createSimpleProject("testavailable2", null, null);
-		assertTrue(project2.isAccessible());
-		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 (and exported) 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), classpath provider problem?", 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);
-	}
-
-	private void removeAllProjects() throws CoreException, InterruptedException {
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IProject[] projects = workspace.getRoot().getProjects();
-		IProject project = null;
-		for (int i = 0; i < projects.length; i++) {
-			project = projects[i];
-			deleteProject(project);
-		}
-	}
-
-	/**
-	 * It's not easy to delete projects. If any of it's files are open by another thread, 
-	 * the operation will fail. So, this method will make several attempts before giving up. 
-	 * @param project
-	 * @throws CoreException
-	 * @throws InterruptedException
-	 */
-	private void deleteProject(IProject project) throws CoreException, InterruptedException {
-		int nTrys = 0;
-		while (project != null && project.exists() && nTrys < MAX_RETRYS) {
-			try {
-				nTrys++;
-				project.delete(true, true, null);
-			}
-			catch (ResourceException e) {
-				if (DEBUG) {
-					System.out.println();
-					System.out.println("Could not delete project on attempt number: "+ nTrys);
-					IStatus eStatus = e.getStatus();
-					// should always be MultiStatus, but we'll check
-					if (eStatus instanceof MultiStatus) {
-						MultiStatus mStatus = (MultiStatus) eStatus;
-						IStatus[] iStatus = mStatus.getChildren();
-						for (int j = 0; j < iStatus.length; j++) {
-							System.out.println("Status: " + j + " " + iStatus[j]);
-						}
-					}
-					else {
-						System.out.println("Status: " + eStatus);
-					}
-				}
-				/*
-				 * If we could not delete the first time, wait a bit and
-				 * re-try. If we could not delete, it is likely because
-				 * another thread has a file open, or similar (such as the
-				 * validation thread).
-				 */
-				Thread.sleep(PAUSE_TIME);
-			}
-		}
-		
-		if (project != null && project.exists()) {
-			fail("Error in test infrastructure. Could not delete project " + project + " after " + MAX_RETRYS + "attempts.");
-		}
-	}
-}
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 d541fc798..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.translation;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-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.IWorkspaceRoot;
-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.internal.validation.JSPJavaValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.jst.jsp.core.tests.validation.ReporterForTest;
-import org.eclipse.jst.jsp.core.tests.validation.ValidationContextForTest;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-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();
-	}
-
-	/**
-	 * Tests jsp translation when jsp is within html comments. See
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=126377
-	 * 
-	 * @throws Exception
-	 */
-	public void test_126377() throws Exception {
-		String projectName = "bug_126377";
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
-		assertTrue(project.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
-		IFile file = project.getFile("WebContent/test126377_noerror.jsp");
-		assertTrue(file.exists());
-				
-		JSPValidator validator = new JSPJavaValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		helper.setURI(file.getFullPath().toOSString());
-		validator.validate(helper, reporter);
-		
-		assertTrue("found jsp java error within html comments when there are none", reporter.getMessages().isEmpty());
-		
-		file = project.getFile("WebContent/test126377_error.jsp");
-		assertTrue(file.exists());
-		helper.setURI(file.getFullPath().toOSString());
-		validator.validate(helper, reporter);
-		
-		int errors = reporter.getMessages().size();
-		assertTrue("found "+errors+" jsp java errors within html comments when there should be 3", (errors == 3));
-	}
-
-	// 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() throws CoreException {
-		IWorkspaceRoot root = null;
-		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(root = ResourcesPlugin.getWorkspace().getRoot(), null);
-		}
-		catch (InterruptedException e) {
-			// woken up from sleep?
-//			StringWriter s = new StringWriter();
-//			e.printStackTrace(new PrintWriter(s));
-//			fail(s.toString());
-		}
-		catch (IllegalArgumentException e) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		catch (OperationCanceledException e) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		finally {
-			if (root != null) {
-				Job.getJobManager().endRule(root);
-			}
-		}
-	}
-	
-	private void waitForBuildAndValidation(IProject project) throws CoreException {
-		project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
-		waitForBuildAndValidation();
-		project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
-		waitForBuildAndValidation();
-	}
-
-	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);
-	}
-	
-	public void test_219761a() throws Exception {
-		/**
-		 * Broken behavior has a Java syntax error on line 19, which only
-		 * contains an include directive to a fragment that doesn't exist.
-		 * 
-		 * All syntax errors should be on lines 25 or 28 and after offset 373
-		 * (single character line delimiter!).
-		 */
-		String testName = "testTranslatorMessagesWithIncludes";
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(testName, null, null);
-		assertTrue(project.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-
-		waitForBuildAndValidation(project);
-		ValidationFramework.getDefault().validate(new IProject[]{project}, true, true, new NullProgressMonitor());
-
-		IFile main = project.getFile("/WebContent/sample.jsp");
-		assertTrue("sample test file does not exist", main.isAccessible());
-		IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-		StringBuffer markerText = new StringBuffer();
-		for (int i = 0; i < markers.length; i++) {
-			// line/start-end
-			markerText.append("\nL" + markers[i].getAttribute(IMarker.LINE_NUMBER) + "/o" + markers[i].getAttribute(IMarker.CHAR_START) + "-"  + markers[i].getAttribute(IMarker.CHAR_END) + ":" + markers[i].getAttribute(IMarker.MESSAGE));
-		}
-		int numberOfSyntaxErrors = 0;
-		for (int i = 0; i < markers.length; i++) {
-			Object message = markers[i].getAttribute(IMarker.MESSAGE);
-			assertNotNull("Marker message was null!", message);
-			if (message.toString().startsWith("Syntax error")) {
-				numberOfSyntaxErrors++;
-				assertTrue("Syntax error reported before line 25" + markerText, ((Integer) markers[i].getAttribute(IMarker.LINE_NUMBER)).intValue() >= 25);
-//				assertTrue("Syntax error reported before offset 371" + markerText, ((Integer) markers[i].getAttribute(IMarker.CHAR_START)).intValue() >= 370);
-//				assertTrue("Syntax error reported after 456" + markerText, ((Integer) markers[i].getAttribute(IMarker.CHAR_START)).intValue() < 456);
-			}
-		}
-//		assertEquals("wrong number of syntax errors reported\n" + markerText, 3, numberOfSyntaxErrors);
-
-		// clean up if we got to the end
-		project.delete(true, true, null);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index d289dec9f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
-	public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
-		if (string1 == null)
-			return false;
-		if (string2 == null)
-			return false;
-
-		StringReader s1Reader = new StringReader(string1);
-		StringReader s2Reader = new StringReader(string2);
-
-		// assume true unless find evidence to the contrary
-		boolean result = true;
-		int s1Char = -1;
-		int s2Char = -1;
-		do {
-
-			s1Char = getNextChar(s1Reader);
-
-			s2Char = getNextChar(s2Reader);
-
-			if (s1Char != s2Char) {
-				result = false;
-				break;
-			}
-		}
-		while (s1Char != -1 && s2Char != -1);
-
-		return result;
-	}
-
-	/**
-	 * Method getNextChar.
-	 * @param s1Reader
-	 * @return char
-	 */
-	private int getNextChar(StringReader reader) {
-		int nextChar = -1;
-		try {
-			nextChar = reader.read();
-			while (isEOL(nextChar)) {
-				nextChar = reader.read();
-			}
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		return nextChar;
-	}
-
-	private boolean isEOL(int aChar) {
-		return (aChar == '\n' || aChar == '\r');
-	}
-
-}
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 952064233..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
+++ /dev/null
@@ -1,153 +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";
-	private static final String NONEMPTY_INLINE_TAG_NAME = "libtags:emptybodycontent";
-
-	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());
-	}
-
-	/**
-	 * Tests if non-empty inline tags are flagged as warnings
-	 * 
-	 * @throws Exception
-	 */
-	public void testNonEmptyInlineTag() throws Exception {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=203254
-		JSPActionValidator validator = new JSPActionValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/nonemptyinlinetag.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.JSPActionValidator_0, NONEMPTY_INLINE_TAG_NAME), 10);
-
-		assertTrue("jsp action validator had problems detecting an error with content in an inline tag", foundError);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
deleted file mode 100644
index 7f654ec6d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPBatchValidatorTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.contentproperties.JSPFContentProperties;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;
-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.ReporterHelper;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests JSP Batch Validator
- */
-public class JSPBatchValidatorTest extends TestCase {
-	String wtp_autotest_noninteractive = null;
-	private static final String PROJECT_NAME = "batchvalidation";
-	Object originalWorkspaceValue = null;
-	IEclipsePreferences workspaceScope = null;
-	IEclipsePreferences projectScope = null;
-	Object[] validatorIds = new String[]{"org.eclipse.jst.jsp.core.JSPContentValidator", "org.eclipse.jst.jsp.core.JSPBatchValidator"};
-	IWorkspace workspace = ResourcesPlugin.getWorkspace();
-
-	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 (!getProject().exists()) {
-			BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
-		}
-		assertTrue("project could not be created", getProject().exists());
-
-		String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
-		IFile fragment = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
-		String qualifier = JSPCorePlugin.getDefault().getBundle().getSymbolicName();
-		workspaceScope = new InstanceScope().getNode(qualifier);
-		projectScope = new ProjectScope(fragment.getProject()).getNode(qualifier);
-		originalWorkspaceValue = workspaceScope.get(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, null);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (wtp_autotest_noninteractive != null)
-			System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
-		projectScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-		projectScope.remove(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS);
-		if (originalWorkspaceValue != null)
-			workspaceScope.put(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, originalWorkspaceValue.toString());
-		else
-			workspaceScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-	}
-
-	/**
-	 * Tests validating 2 jsp files. See
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=214441
-	 * 
-	 * @throws Exception
-	 */
-	public void testValidating2Files() throws Exception {
-		JSPValidator validator = new JSPJavaValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath1 = "/" + PROJECT_NAME + "/WebContent/ihaveerrors.jsp";
-		IFile file1 = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath1));
-		assertTrue(file1.exists());
-
-		String filePath2 = "/" + PROJECT_NAME + "/WebContent/ihaveerrors2.jsp";
-		IFile file2 = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath1));
-		assertTrue(file2.exists());
-
-		helper.setURIs(new String[]{filePath1, filePath2});
-
-		validator.validate(helper, reporter);
-		assertTrue("jsp errors were not found in both files", reporter.getMessages().size() == 2);
-	}
-
-	public void testFragmentValidationPreferenceOnProject() throws Exception {
-		JSPBatchValidator validator1 = new JSPBatchValidator();
-		JSPContentValidator validator2 = new JSPContentValidator();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
-		ValidationResult result = null;
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
-		// enable workspace-wide but disable in project, no problem markers
-		// expected
-		workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
-		projectScope.putBoolean(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS, true);
-		projectScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-
-		result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
-		result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
-		assertEquals("Problems found while fragment validation was disabled in project but enabled on workspace", 0, (((ReporterHelper)result.getReporter(null)).getMessages().size()));
-
-		/*
-		 * disable workspace-wide but enable in project, some problem markers
-		 * expected
-		 */
-		workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-		projectScope.putBoolean(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS, true);
-		projectScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
-		JSPFContentProperties.setProperty(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, file, Boolean.toString(true));
-
-		result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
-		result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
-		assertTrue("Problems not found while fragment validation was enabled for project but disabled on workspace", 0 < (((ReporterHelper)result.getReporter(null)).getMessages().size()));
-	}
-
-	public void testFragmentValidationPreferenceOnWorkspace() throws Exception {
-		JSPBatchValidator validator1 = new JSPBatchValidator();
-		JSPContentValidator validator2 = new JSPContentValidator();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/header.jspf";
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-		ValidationResult result = null;
-
-		// disable workspace-wide, no problem markers expected
-		workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-
-		result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
-		result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
-		assertEquals("Problem markers found while fragment validation was disabled", 0, (((ReporterHelper)result.getReporter(null)).getMessages().size()));
-
-		// enable workspace-wide, some problem markers expected
-		workspaceScope.putBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
-		ValidationFramework.getDefault().validate(new IProject[]{getProject()}, true, false, new NullProgressMonitor());
-		ValidationFramework.getDefault().join(new NullProgressMonitor());
-
-		result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
-		result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
-		assertTrue("Problem markers not found while fragment validation was enabled on workspace", (((ReporterHelper)result.getReporter(null)).getMessages().size()) != 0);
-
-		// check default value is true
-		workspaceScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-		projectScope.remove(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-		projectScope.remove(JSPCorePreferenceNames.VALIDATION_USE_PROJECT_SETTINGS);
-
-		result = validator1.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor());
-		result.mergeResults(validator2.validate(file, IResourceDelta.CHANGED, new ValidationState(), new NullProgressMonitor()));
-
-		assertTrue("Problem markers not found while fragment validation was preferences were default", (((ReporterHelper)result.getReporter(null)).getMessages().size()) != 0);
-	}
-
-	/**
-	 * @return
-	 */
-	private IProject getProject() {
-		return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
-	}
-}
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 ab7667d1b..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-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;
-
-public 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 81d7453fc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.validation;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-public class ValidationContextForTest implements IValidationContext {
-	private String[] fURIs = null;
-
-	public void setURI(String uri) {
-		String[] uris = null;
-		if (uri != null)
-			uris = new String[]{uri};
-
-		setURIs(uris);
-	}
-	
-	public void setURIs(String[] uris) {
-		fURIs = uris;
-	}
-
-	public String[] getURIs() {
-		if (fURIs != null)
-			return fURIs;
-		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 1d474107e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java
+++ /dev/null
@@ -1,422 +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.PrintWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-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$
-	}
-	
-	public void testSourceOpen15() throws IOException {
-		sourceParserTest("sample08.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-	
-	public void testSourceInsert15() throws IOException {
-		sourceParserTest("sample08.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	
-	public void testSourceAppend15() throws IOException {
-		sourceParserTest("sample08.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-	
-	public void testSourceOpen16() throws IOException {
-		sourceParserTest("sample08.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-	
-	public void testSourceInsert16() throws IOException {
-		sourceParserTest("sample08.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	
-	public void testSourceAppend16() throws IOException {
-		sourceParserTest("sample08.jspf", MODE_APPEND); //$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) {
-			StringWriter s = new StringWriter();
-			e.printStackTrace(new PrintWriter(s));
-			fail(s.toString());
-		}
-		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/results/JSPedCSSSourceParserTest-sample08.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jsp
deleted file mode 100644
index 709b113fa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-[0, 71] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/71, 
-[71, 134] (<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-)
-    ContextRegion--> CSS_JSP_SCRIPTLET: 0-61/63, 
-[134, 171] (<%@ include file="./styles.jspf" %>
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-35/37, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jspf
deleted file mode 100644
index bdb584bcc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample08.jspf
+++ /dev/null
@@ -1,8 +0,0 @@
-[0, 63] (<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-)
-    ContextRegion--> CSS_JSP_SCRIPTLET: 0-61/63, 
-[63, 100] (<%@ include file="./styles.jspf" %>
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-35/37, 
-
--------
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/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jsp
deleted file mode 100644
index bfaf6295f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-<%@ include file="./styles.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jspf
deleted file mode 100644
index 8abadc747..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample08.jspf
+++ /dev/null
@@ -1,2 +0,0 @@
-<% pageContext.getRequest().setCharacterEncoding("UTF-8"); %>
-<%@ include file="./styles.jspf" %>
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/batchvalidation/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.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/batchvalidation/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.project
deleted file mode 100644
index 96a356a71..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>batchvalidation</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/batchvalidation/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/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/batchvalidation/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 0957ef8b0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/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>batchvalidation</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/batchvalidation/WebContent/header.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/header.jspf
deleted file mode 100644
index 36b72309d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/header.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-
-<%= i %>
- 
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors.jsp
deleted file mode 100644
index 5ab5b55b5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<% i am broken %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors2.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors2.jsp
deleted file mode 100644
index afafcd1be..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/WebContent/ihaveerrors2.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<% i am hungry %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/batchvalidation/src/.keepme
+++ /dev/null
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/bug243243/css.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/css.jsp
deleted file mode 100644
index 9b89ce07b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/css.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page language="java" contentType="text/css" pageEncoding="UTF-8"%>
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus. 
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/default.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/default.jsp
deleted file mode 100644
index ac2daa51a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/default.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page  %>
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus. 
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/html.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/html.jsp
deleted file mode 100644
index 652ebe719..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/html.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="javascript" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus. 
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/nodirective.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/nodirective.jsp
deleted file mode 100644
index 382b355f0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/nodirective.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus. 
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/rdf.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/rdf.jsp
deleted file mode 100644
index 10c772410..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/rdf.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="application/rdf+xml; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-
-  Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus. 
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/xml.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/xml.jsp
deleted file mode 100644
index 14a2df629..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug243243/xml.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="text/xml; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-
-  Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus ac nibh. Sed iaculis, purus ac commodo auctor, mi tellus vulputate tellus, in mollis nisi turpis nec elit. Etiam blandit pulvinar leo. In tristique porttitor justo. Aliquam tempus pharetra turpis. Mauris consequat nisi vitae nunc. Nunc sit amet justo. Vestibulum a leo. Aenean non risus. Nulla vestibulum tellus. 
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>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp
deleted file mode 100644
index 91f4f0192..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/norequiredattribute.jsp
+++ /dev/null
@@ -1,15 +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://nothing.com/libtags" prefix="libtags"%>
-<!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>Insert title here</title>
-</head>
-<body>
-<libtags:ireqattrs></libtags:ireqattrs>
-<jsp:attribute></jsp:attribute>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.jsp
deleted file mode 100644
index 10e725031..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/undefinedattribute.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://nothing.com/libtags" prefix="libtags"%>
-<%@ page idont="work" %>
-<!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>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme idont="work"></libtags:emptyme>
-<jsp:body idont="work"></jsp:body>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp
deleted file mode 100644
index e616adeb0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/worksfine.jsp
+++ /dev/null
@@ -1,18 +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://nothing.com/libtags" prefix="libtags"%>
-<!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>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme></libtags:emptyme>
-<jsp:attribute name="named"></jsp:attribute>
-<libtags:ireqattrs><jsp:attribute name="name"></jsp:attribute></libtags:ireqattrs>
-<libtags:ireqattrs name="<%= "named"%>" scope="<%= "expression" %>"></libtags:ireqattrs>
-<libtags:ihaveattrs name="boo"></libtags:ihaveattrs>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
deleted file mode 100644
index 22e550ecb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_118251-f</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
deleted file mode 100644
index 1d5f5d40c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="Web Content/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="Web Content/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
deleted file mode 100644
index 5041b27e9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_118251-g</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
deleted file mode 100644
index 48030320d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The accompanying jar contains a TLD with a URI specified in
-it as well as a big long file that should slow down the
-taglib indexing.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.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_126377/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.project
deleted file mode 100644
index a37562449..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/.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_126377/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/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_126377/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/WEB-INF/web.xml
deleted file mode 100644
index ecdb74832..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/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>127377</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_126377/WebContent/test126377_error.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_error.jsp
deleted file mode 100644
index 14a721c89..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_error.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Test</title>
-<script language="JavaScript>
-<!--
-    // some JavaScript here
-    <% imtrue = true;
-       // more scriptlet here
-    %>
-    // more JavaScript here
--->
-</script>
-</head>
-<body>
-<!--
-<%
-boolean imtrue2 = imtrue;
-%>
--->
-
-<!--
-before if
-<% if (imtrue3) { %>
-after if
-before else
-<% } else { %>
-after else
-<% } %>
--->
-
-
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_noerror.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_noerror.jsp
deleted file mode 100644
index 57da683ee..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/WebContent/test126377_noerror.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Test</title>
-<script language="JavaScript>
-<!--
-    // some JavaScript here
-    <% boolean imtrue = true;
-       // more scriptlet here
-    %>
-    // more JavaScript here
--->
-</script>
-</head>
-<body>
-<!--
-<%
-boolean imtrue2 = imtrue;
-%>
--->
-
-<!--
-before if
-<% if (imtrue2) { %>
-after if
-before else
-<% } else { %>
-after else
-<% } %>
--->
-
-
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_126377/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
deleted file mode 100644
index ac7bfe413..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_148717</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 76ed56f40..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="bug_148717">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="bug_148717"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index eead6ed01..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="1.4"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
deleted file mode 100644
index ebad27b52..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 18536698d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_c</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-		<taglib-uri>http://example.com/external-uri</taglib-uri>
-		<taglib-location>/WEB-INF/lib/internal.jar</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath
deleted file mode 100644
index b63ab41fd..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="lib" path="struts.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project
deleted file mode 100644
index 1db7a0050..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_174042</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.jspf
deleted file mode 100644
index 363810814..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/includeme.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"%>
-<bean:define id="id3" type="com.nitin.TestBean"></bean:define>
-<%  %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp
deleted file mode 100644
index 6935c8865..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/main.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ include file="includeme.jspf"%>
-	<%= id3 + alpha %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java
deleted file mode 100644
index 24a759b2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_174042/src/com/nitin/TestBean.java
+++ /dev/null
@@ -1,29 +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 com.nitin;
-
-public class TestBean {
-
-	public TestBean() {
-	}
-	
-	String dummyProperty = null;
-
-	public String getDummyProperty() {
-		return dummyProperty;
-	}
-
-	public void setDummyProperty(String dummyProperty) {
-		this.dummyProperty = dummyProperty;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath
deleted file mode 100644
index b63ab41fd..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="lib" path="struts.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project
deleted file mode 100644
index 30509bf4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_178443</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf
deleted file mode 100644
index 4292126c3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/includeme.jspf
+++ /dev/null
@@ -1,7 +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"%>
-
-
-<bean:define id="id3" type="com.nitin.TestBean"></bean:define>
-<%  %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp
deleted file mode 100644
index bdda8a5fa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/main.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ include file="includeme.jspf"%>
-<%  %>
-
-<bean:define id="beta"/>
- 
-	<%= alpha + beta %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java
deleted file mode 100644
index 24a759b2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_178443/src/com/nitin/TestBean.java
+++ /dev/null
@@ -1,29 +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 com.nitin;
-
-public class TestBean {
-
-	public TestBean() {
-	}
-	
-	String dummyProperty = null;
-
-	public String getDummyProperty() {
-		return dummyProperty;
-	}
-
-	public void setDummyProperty(String dummyProperty) {
-		this.dummyProperty = dummyProperty;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath
deleted file mode 100644
index add958d99..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry combineaccessrules="false" kind="src" path="/j"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/k"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="struts.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project
deleted file mode 100644
index 30509bf4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_178443</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp
deleted file mode 100644
index 57efa607f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/main.jsp
+++ /dev/null
@@ -1,8 +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"%>
-<%  %>
-
-<bean:define id="beta"/>
- 
-	<%= alpha + beta %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_181057/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
deleted file mode 100644
index e3720e751..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_87351</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml
deleted file mode 100644
index bf80a5beb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>bug_87351</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
deleted file mode 100644
index 3baff4b7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% String this is broken %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath
deleted file mode 100644
index 233be1d2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project
deleted file mode 100644
index 63bc5f54d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/j/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>j</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/jspErrorProject.zip b/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspErrorProject.zip
deleted file mode 100644
index ebc7d9767..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/jspErrorProject.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath
deleted file mode 100644
index 233be1d2c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project
deleted file mode 100644
index 304ac0bb8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/k/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>k</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/prj119576_a/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
deleted file mode 100644
index 6225fab7d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>prj119576_a</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
deleted file mode 100644
index af232736b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_a" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_a</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
deleted file mode 100644
index 379a44c94..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
deleted file mode 100644
index 55549b4dc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "taglib.jspf" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
deleted file mode 100644
index 58db5bdca..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ include file = "body.jsp" %>
-<%@ include file = "body1.jsp" %>
-<sample:code/>
-<% java.util.Date bodyDate = headerDate; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
deleted file mode 100644
index a539fd633..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<% java.util.Date headerDate = null; %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
deleted file mode 100644
index 6c2d86f1e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
deleted file mode 100644
index 4cdb54229..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<%="Hello, World!"%>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
deleted file mode 100644
index 6225fab7d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>prj119576_a</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 0ba8bed92..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_b" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_b</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
deleted file mode 100644
index 379a44c94..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
deleted file mode 100644
index 828d2409d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@include file = "body1.jsp" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
deleted file mode 100644
index eecf27e29..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
deleted file mode 100644
index 349f4b235..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>prj119576_c</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 73560f865..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_c</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
deleted file mode 100644
index 6aa228952..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ include file = "header.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
deleted file mode 100644
index 71c73cf10..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@include file = "body1.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
deleted file mode 100644
index 503c7a0b9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar
deleted file mode 100644
index db32f9f45..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/struts.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath
deleted file mode 100644
index f3634481f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="web stuff/WEB-INF/lib/struts.jar"/>
-	<classpathentry kind="output" path="web stuff/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project
deleted file mode 100644
index 45399cdcb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testLoadTaglibs</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/testLoadTaglibs/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/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/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/WEB-INF/web.xml
deleted file mode 100644
index e8d332769..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/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>testLoadTaglibs</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/testLoadTaglibs/web stuff/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.jsp
deleted file mode 100644
index 29650a495..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/test1.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">
-<%@taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic"%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
- <logic:empty/>
-
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp
deleted file mode 100644
index e73f83243..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testLoadTaglibs/web stuff/testX.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-xmlns:logic="http://jakarta.apache.org/struts/tags-logic">
-
-<logic:empty/>
-
-</jsp:root>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.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/testTranslatorMessagesWithIncludes/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.project
deleted file mode 100644
index 147f01134..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testTranslatorMessagesWithIncludes</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/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/input.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/input.tld
deleted file mode 100644
index 53c815a5a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/input.tld
+++ /dev/null
@@ -1,33 +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>input</short-name>
-
-  <description>
-  </description>
-
-
-  <!-- HTML Text TAG -->
-  <tag>
-    <name>text</name>
-    <tag-class>test.taglib.Text</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Tag lib to show validation error.
-    </description>
-    <attribute>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-
-
-
-
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 1990ad793..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/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>test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/commonEventHandlers.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/commonEventHandlers.jspf
deleted file mode 100644
index b2faa536c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/commonEventHandlers.jspf
+++ /dev/null
@@ -1 +0,0 @@
-topmargin=0 onLoad="loadPage();" onUnload="unloadPage();"
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/sample.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/sample.jsp
deleted file mode 100644
index fd7297503..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/WebContent/sample.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
- <%@page import="java.util.Calendar"%>
-<%@ taglib uri="/WEB-INF/input.tld" prefix="input" %>
-<HTML>
-
-<HEAD>    
-
-</HEAD>
-
-
-
-<BODY>
-
-<p> 
- The problem in both cases is a missing equals sign after the percent.  However the include file=is
- highlighed instead of the actual error
-
-
-
-  <%@ include file="commonEventHandlers.jspf"%> 
-  </p>
-  
- <p> 
-  
-
- <input:text name="<% Calendar.DAY_OF_MONTH  %>" />
- </p>
- <p>
- <input:text name="<% Calendar.DAY_OF_MONTH  %>" />
-
-
-  
-</p>
-
-</BODY>
-</HTML>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testTranslatorMessagesWithIncludes/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
deleted file mode 100644
index 8d5f4fb88..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" exported="false" kind="src" path="/testavailable2"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
deleted file mode 100644
index 5baaadda7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testavailable1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
deleted file mode 100644
index 5baaadda7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testavailable1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
deleted file mode 100644
index a335f6a37..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testcache1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
deleted file mode 100644
index 274293f5a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testcache2</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project
deleted file mode 100644
index 5f2075ae0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testvalidatejspactions</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/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/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/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld
deleted file mode 100644
index 749285c87..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/tld/libtags.tld
+++ /dev/null
@@ -1,44 +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>
-	<tag>
-		<name>emptybodycontent</name>
-		<tagclass>nothing.taglib.emptyme</tagclass>
-		<bodycontent>empty</bodycontent>
-	</tag>
-</taglib>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 62ebcc80d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/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>
-		<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/testvalidatejspactions/WebContent/nonemptyinlinetag.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/nonemptyinlinetag.jsp
deleted file mode 100644
index f0e834745..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/nonemptyinlinetag.jsp
+++ /dev/null
@@ -1,15 +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">
-<%@ taglib uri="http://nothing.com/libtags" prefix="libtags"%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<libtags:emptybodycontent>i should have an empty body</libtags:emptybodycontent>
-<libtags:emptyme>nothing</libtags:emptyme>
-<libtags:emptybodycontent />
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp
deleted file mode 100644
index 91f4f0192..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/norequiredattribute.jsp
+++ /dev/null
@@ -1,15 +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://nothing.com/libtags" prefix="libtags"%>
-<!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>Insert title here</title>
-</head>
-<body>
-<libtags:ireqattrs></libtags:ireqattrs>
-<jsp:attribute></jsp:attribute>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.jsp
deleted file mode 100644
index 10e725031..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/undefinedattribute.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://nothing.com/libtags" prefix="libtags"%>
-<%@ page idont="work" %>
-<!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>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme idont="work"></libtags:emptyme>
-<jsp:body idont="work"></jsp:body>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp
deleted file mode 100644
index 18acb7162..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/WebContent/worksfine.jsp
+++ /dev/null
@@ -1,19 +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://nothing.com/libtags" prefix="libtags"%>
-<!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>Insert title here</title>
-</head>
-<body>
-<libtags:emptyme></libtags:emptyme>
-<jsp:attribute name="named"></jsp:attribute>
-<%-- Make sure that attributes can be defined using jsp:attribute --%>
-<libtags:ireqattrs><jsp:attribute name="name"></jsp:attribute></libtags:ireqattrs>
-<libtags:ireqattrs name="<%= "named"%>" scope="<%= "expression" %>"></libtags:ireqattrs>
-<libtags:ihaveattrs name="boo"></libtags:ihaveattrs>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testvalidatejspactions/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath b/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/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.tests.encoding/.cvsignore b/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
deleted file mode 100644
index bf82c7f00..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-jspencodingtests.jar
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.project b/tests/org.eclipse.jst.jsp.tests.encoding/.project
deleted file mode 100644
index 8ea61d693..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.tests.encoding</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 3417adca7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
-Bundle-Version: 1.0.300.qualifier
-Bundle-ClassPath: jspencodingtests.jar
-Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.tests.encoding.jsp
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version="[3.8.2,4.0.0)",
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/about.html b/tests/org.eclipse.jst.jsp.tests.encoding/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor�s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 56b8544e3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,21 +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
-###############################################################################
-source.jspencodingtests.jar = src/
-output.jspencodingtests.jar = bin/
-bin.includes = jspencodingtests.jar,\
-               testfiles/,\
-               test.xml,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-src.includes = testfiles/,\
-               test.xml,\
-               META-INF/
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
deleted file mode 100644
index eea9f1fc3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/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.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Encoding Tests Plug-in
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 54097e04e..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPEncodingTests;
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester;
-import org.eclipse.jst.jsp.tests.encoding.jsp.TestContentTypeDetectionForJSP;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
-	private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestContentTypeDetectionForJSP.class};
-
-	public static Test suite() {
-		return new JSPEncodingTestSuite();
-	}
-
-	public JSPEncodingTestSuite() {
-		super("JSP Encoding Test Suite");
-		for (int i = 0; i < classes.length; i++) {
-			addTest(new TestSuite(classes[i], classes[i].getName()));
-		}
-	}
-
-	/**
-	 * @param theClass
-	 */
-	public JSPEncodingTestSuite(Class theClass) {
-		super(theClass);
-	}
-
-	/**
-	 * @param theClass
-	 * @param name
-	 */
-	public JSPEncodingTestSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	/**
-	 * @param name
-	 */
-	public JSPEncodingTestSuite(String name) {
-		super(name);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
deleted file mode 100644
index 7fdecd2ac..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPEncodingTestsPlugin extends Plugin {
-	// The shared instance.
-	private static JSPEncodingTestsPlugin plugin;
-
-	public static List getAllTestFiles(String topDirName) {
-		List result = null;
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + topDirName;
-		File topDir = new File(location);
-		if (!topDir.isDirectory()) {
-			throw new IllegalArgumentException(topDirName + " is not a directory");
-		}
-
-		result = getFilesInDir(topDir);
-		return result;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JSPEncodingTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	private static List getFilesInDir(File topDir) {
-		List files = new ArrayList();
-		File[] topFiles = topDir.listFiles();
-		for (int i = 0; i < topFiles.length; i++) {
-			File file = topFiles[i];
-			if (file.isFile()) {
-				files.add(file);
-			}
-			else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
-				List innerFiles = getFilesInDir(file);
-				files.addAll(innerFiles);
-			}
-		}
-		return files;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = FileLocator.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = JSPEncodingTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	public static File getTestFile(String filepath) {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		File result = new File(location);
-		return result;
-	}
-
-	public static Reader getTestReader(String filepath) throws FileNotFoundException {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		Reader result = new FileReader(location);
-		return result;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public JSPEncodingTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
deleted file mode 100644
index 16777c1ca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class JSPEncodingTests extends TestCase {
-
-	/**
-	 * Ensures that an InputStream has mark/reset support.
-	 */
-	private static InputStream getMarkSupportedStream(InputStream original) {
-		if (original == null)
-			return null;
-		if (original.markSupported())
-			return original;
-		return new BufferedInputStream(original);
-	}
-	private boolean DEBUG = false;
-	private final String fileDir = "jsp/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private int READ_BUFFER_SIZE = 8000;
-
-	public JSPEncodingTests(String name) {
-		super(name);
-	}
-
-	private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
-		File file = JSPEncodingTestsPlugin.getTestFile(filename);
-		if (!file.exists())
-			throw new IllegalArgumentException(filename + " was not found");
-		InputStream inputStream = new FileInputStream(file);
-		// InputStream inStream = getClass().getResourceAsStream(filename);
-		InputStream istream = getMarkSupportedStream(inputStream);
-		try {
-			detector.set(istream);
-			EncodingMemento encodingMemento = ((JSPResourceEncodingDetector)detector).getEncodingMemento();
-			String foundIANAEncoding = encodingMemento.getJavaCharsetName();
-			// I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
-			// since
-			// some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
-			// We do want to be tolerant on input, and accept either, but I
-			// think
-			// that SupportedJavaEncodings needs to be changed to "recommend"
-			// Shift_JIS.
-			boolean expectedIANAResult = false;
-			expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
-			assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
-			// a very simple read test ... will cause JUnit error (not fail)
-			// if throws exception.
-			ensureCanRead(filename, foundIANAEncoding, istream);
-		}
-		finally {
-			if (istream != null) {
-				istream.close();
-			}
-			if (inputStream != null) {
-				inputStream.close();
-			}
-		}
-	}
-
-	/**
-	 * This method just reads to stream, to be sure it can be read per
-	 * encoding, without exception.
-	 */
-	private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
-		Charset charset = Charset.forName(encoding);
-		CharsetDecoder charsetDecoder = charset.newDecoder();
-		charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
-		charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
-		InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
-		StringBuffer stringBuffer = readInputStream(reader);
-		if (DEBUG) {
-			System.out.println();
-			System.out.println(filename);
-			System.out.println(stringBuffer.toString());
-		}
-	}
-
-	private StringBuffer readInputStream(Reader reader) throws IOException {
-
-		StringBuffer buffer = new StringBuffer();
-		int numRead = 0;
-		char tBuff[] = new char[READ_BUFFER_SIZE];
-		while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
-			buffer.append(tBuff, 0, numRead);
-		}
-		return buffer;
-	}
-
-	public void testdefect4205wpsjsp() throws IOException {
-		String filename = fileLocation + "defect_4205_wps.jsp";
-		doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
-	}
-
-	public void testJSPEmptyFile() throws IOException {
-		String filename = fileLocation + "EmptyFile.jsp";
-		doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * Caution, when this file prints out in console (when debug set to true,
-	 * it appears incorrect (due to font problems in console).
-	 */
-	public void testUTF16() throws IOException {
-		String filename = fileLocation + "testUTF16.jsp";
-		// [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
-		doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * This test shows unicode BOM should take priority over settings/defaults
-	 */
-	public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
-		String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.jsp";
-		doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * This test shows unicode BOM should take priority over settings/defaults
-	 * Note: UTF-16 == UTF-16BE
-	 */
-	public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
-		String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp";
-		// [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
-		doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
-	}
-
-	public void testUTF16WithJapaneseChars() throws IOException {
-		String filename = fileLocation + "utf16WithJapaneseChars.jsp";
-		// [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
-		doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
-	}
-
-	public void testUTF83ByteBOM() throws IOException {
-		String filename = fileLocation + "UTF8With3ByteBOM.jsp";
-		doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLIllformedNormalNonDefault() throws IOException {
-		String filename = fileLocation + "IllformedNormalNonDefault.jsp";
-		String ianaInFile = "ISO-8859-8";
-		doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLNoEncoding() throws IOException {
-		String filename = fileLocation + "noEncoding.jsp";
-		doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLNormalNonDefault() throws IOException {
-		String filename = fileLocation + "NormalNonDefault.jsp";
-		String ianaInFile = "ISO-8859-8";
-		doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
-	}
-	
-	public void testUTF16le() throws IOException {
-		String filename = fileLocation + "utf16le.jsp";
-		doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
-	}
-	
-	public void testUTF16be() throws IOException {
-		String filename = fileLocation + "utf16be.jsp";
-		doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
-	}
-	
-	public void testUTF16BOM() throws IOException {
-		String filename = fileLocation + "utf16BOM.jsp";
-		doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
-	}
-	
-	public void testUTF16leXmlStyle() throws IOException {
-		String filename = fileLocation + "utf16le_xmlStyle.jsp";
-		doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
deleted file mode 100644
index 4ffe0758d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
-	private boolean DEBUG = false;
-	private String fCharset;
-	private String fContentType;
-	private String fContentTypeValue;
-	private final String fileDir = "jsp/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private String fPageEncodingValue = null;
-	private String fXMLDecEncodingName;
-	private String fLanguage;
-
-	private void doTestFile(String filename, String expectedName) throws Exception {
-		doTestFile(filename, expectedName, null, null);
-	}
-
-	private void doTestFile(String filename, String expectedName, String finalTokenType, String expectedContentType) throws Exception {
-		JSPHeadTokenizer tokenizer = null;
-		Reader fileReader = null;
-		try {
-			if (DEBUG) {
-				System.out.println();
-				System.out.println("       " + filename);
-				System.out.println();
-			}
-			fileReader = JSPEncodingTestsPlugin.getTestReader(filename);
-			tokenizer = new JSPHeadTokenizer(fileReader);
-		}
-		catch (IOException e) {
-			System.out.println("Error opening file \"" + filename + "\"");
-		}
-
-		HeadParserToken token = parseHeader(tokenizer);
-		String resultValue = getAppropriateEncoding();
-		fileReader.close();
-		if (finalTokenType != null) {
-			assertTrue("did not end as expected. found:  " + token.getType(), finalTokenType.equals(token.getType()));
-		}
-
-		if (expectedName == null) {
-			assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
-		}
-		else {
-			assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
-		}
-
-		String foundContentType = getContentType();
-		if (expectedContentType == null) {
-			assertTrue("expected no contentType, but found: " + foundContentType, foundContentType == null);
-		}
-		else {
-			assertTrue("expected " + expectedContentType + " but found " + foundContentType, expectedContentType.equals(foundContentType));
-		}
-
-	}
-
-	// public void testMalformedNoEncoding() {
-	// String filename = fileLocation + "MalformedNoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testMalformedNoEncodingXSL() {
-	// String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNoEncoding() {
-	// String filename = fileLocation + "NoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	public void testNormalNonDefault() throws Exception {
-		String filename = fileLocation + "NormalNonDefault.jsp";
-		doTestFile(filename, "ISO-8859-8");
-	}
-
-	// public void testNormalPageCaseNonDefault() {
-	// String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testdefect223365() {
-	// String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
-	// doTestFile(filename);
-	// }
-	/**
-	 * returns encoding according to priority: 1. XML Declaration 2. page
-	 * directive pageEncoding name 3. page directive contentType charset name
-	 */
-	private String getAppropriateEncoding() {
-		String result = null;
-		if (fXMLDecEncodingName != null)
-			result = fXMLDecEncodingName;
-		else if (fPageEncodingValue != null)
-			result = fPageEncodingValue;
-		else if (fCharset != null)
-			result = fCharset;
-		return result;
-	}
-
-	private String getContentType() {
-		return fContentType;
-	}
-
-	private boolean isLegalString(String tokenType) {
-		boolean result = false;
-		if (tokenType != null) {
-			result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-		}
-		return result;
-	}
-
-	/**
-	 * This method should be exactly the same as what is in
-	 * JSPResourceEncodingDetector
-	 * 
-	 * @param contentType
-	 */
-	private void parseContentTypeValue(String contentType) {
-		Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*"); //$NON-NLS-1$
-		String[] parts = pattern.split(contentType);
-		if (parts.length > 0) {
-			// if only one item, it can still be charset instead of
-			// contentType
-			if (parts.length == 1) {
-				if (parts[0].length() > 6) {
-					String checkForCharset = parts[0].substring(0, 7);
-					if (checkForCharset.equalsIgnoreCase("charset")) {
-						int eqpos = parts[0].indexOf('=');
-						eqpos = eqpos + 1;
-						if (eqpos < parts[0].length()) {
-							fCharset = parts[0].substring(eqpos);
-							fCharset = fCharset.trim();
-						}
-					}
-					else {
-						fContentType = parts[0];
-					}
-				}
-			}
-			else {
-				fContentType = parts[0];
-			}
-		}
-		if (parts.length > 1) {
-			fCharset = parts[1];
-		}
-	}
-
-	/**
-	 * Give's priority to encoding value, if found else, looks for contentType
-	 * value;
-	 */
-	private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws Exception {
-		fPageEncodingValue = null;
-		fCharset = null;
-		fContentType = null;
-		HeadParserToken token = null;
-		HeadParserToken finalToken = null;
-		do {
-			token = tokenizer.getNextToken();
-			String tokenType = token.getType();
-
-			if(canHandleAsUnicodeStream(tokenType)) {
-				
-			}
-			else if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fXMLDecEncodingName = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fPageEncodingValue = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fContentTypeValue = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fLanguage = valueToken.getText();
-					}
-				}
-			}
-		}
-		while (tokenizer.hasMoreTokens());
-		if (fContentTypeValue != null) {
-			parseContentTypeValue(fContentTypeValue);
-		}
-		finalToken = token;
-		return finalToken;
-	}
-	
-	private boolean canHandleAsUnicodeStream(String tokenType) {
-		boolean canHandleAsUnicode = false;
-		if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
-			canHandleAsUnicode = true;
-			this.fCharset = "UTF-8"; //$NON-NLS-1$
-		}
-		else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
-			canHandleAsUnicode = true;
-			this.fCharset = "UTF-16"; //$NON-NLS-1$
-		}
-		return canHandleAsUnicode;
-	}
-
-	public void testBestCase() throws Exception {
-		String filename = fileLocation + "nomalDirectiveCase.jsp";
-		doTestFile(filename, "ISO-8859-2", null, "text/html");
-	}
-
-	public void testMinimalPageDirective() throws Exception {
-		String filename = fileLocation + "minimalPageDirective.jsp";
-		doTestFile(filename, null, null, "text/html");
-	}
-
-	public void testIllFormed() throws Exception {
-		String filename = fileLocation + "testIllFormed.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testIllFormed2() throws Exception {
-		String filename = fileLocation + "testIllFormed2.jsp";
-		doTestFile(filename, "UTF-8");
-	}
-
-	public void testIllformedNormalNonDefault() throws Exception {
-		String filename = fileLocation + "IllformedNormalNonDefault.jsp";
-		doTestFile(filename, "ISO-8859-8", null, "text/html");
-	}
-
-	public void testEmptyFile() throws Exception {
-		String filename = fileLocation + "EmptyFile.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNomalDirectiveCaseUsingXMLSyntax() throws Exception {
-		String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
-		doTestFile(filename, "ISO-8859-2", null, "text/html");
-	}
-
-	public void testNoPageDirective() throws Exception {
-		String filename = fileLocation + "testNoPageDirective.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNormalPageDirectiveWithXMLDecl() throws Exception {
-		String filename = fileLocation + "nomalDirectiveCasewithXMLDecl.jsp";
-		doTestFile(filename, "ISO-8859-1", null, "text/html");
-	}
-
-
-	public void testNoPageDirectiveAtFirst() throws Exception {
-		String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
-		doTestFile(filename, "ISO-8859-2", null, "text/html");
-	}
-
-	public void testNoPageDirectiveInLargeFile() throws Exception {
-		String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
-		doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED, null);
-	}
-
-	public void testNormalCaseWithNeither() throws Exception {
-		String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNormalCharset() throws Exception {
-		String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
-		doTestFile(filename, "ISO-8859-3", null, "text/html");
-	}
-	
-	public void testUTF16le() throws Exception {
-		String filename = fileLocation + "utf16le.jsp";
-		doTestFile(filename, "UTF-16LE", null, "text/html");
-	}
-	
-	public void testUTF16be() throws Exception {
-		String filename = fileLocation + "utf16be.jsp";
-		doTestFile(filename, "UTF-16BE", null, "text/html");
-	}
-	
-	/*
-		sun.io.MalformedInputException
-		at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
-		at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
-		at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
-		at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
-		at java.io.InputStreamReader.read(InputStreamReader.java:212)
-		at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.zzRefill(JSPHeadTokenizer.java:359)
-		at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.primGetNextToken(JSPHeadTokenizer.java:598)
-		at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.getNextToken(JSPHeadTokenizer.java:254)
-		at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.parseHeader(JSPHeadTokenizerTester.java:182)
-		at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.doTestFile(JSPHeadTokenizerTester.java:58)
-		at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.testUTF16BOM(JSPHeadTokenizerTester.java:324)
-	*/
-
-	public void testUTF16BOM() throws Exception {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=243735
-//		String filename = fileLocation + "utf16BOM.jsp";
-//		dotestfile(filename, "utf-16", null, null);
-	}
-	
-	public void testUTF16leXmlStyle() throws Exception {
-		String filename = fileLocation + "utf16le_xmlStyle.jsp";
-		doTestFile(filename, "UTF-16LE", null, null);
-	}
-
-	public String getLanguage() {
-		return fLanguage;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index a532152d9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForJSP extends TestContentTypeDetection {
-
-	protected void doTest(String expectedContentType, String filePath, Class expectedException, String expectedJSPContentType) throws CoreException, IOException {
-		super.doTest(expectedContentType, filePath, expectedException);
-		
-		IFile file = (IFile) getTestProject().findMember(filePath);
-		assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
-		IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
-		IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
-		String streamJSPContentType = (String) streamContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-
-		checkResults(expectedJSPContentType, streamJSPContentType);
-		
-		
-		String fileJSPContentType = (String) fileContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-		checkResults(expectedJSPContentType, fileJSPContentType);
-
-
-	}
-
-	private void checkResults(String expectedJSPContentType, String foundJSPContentType) {
-		if (expectedJSPContentType == null) {
-			assertTrue("expected no contentType, but found: " + foundJSPContentType, foundJSPContentType == null);
-		}
-		else {
-			assertTrue("expected " + expectedJSPContentType + " but found " + foundJSPContentType, expectedJSPContentType.equals(foundJSPContentType));
-		}
-	}
-	
-	public void testFile100() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null, "text/html");
-	}
-
-	public void testFile101() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null, "text/html");
-	}
-
-	public void testFile102() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null, "text/html");
-	}
-
-	public void testFile65() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null, null);
-	}
-
-	public void testFile66() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null, "text/html");
-	}
-
-	public void testFile67() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
-	}
-
-	public void testFile68() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/javaEncodingValue.jsp", null, "text/html");
-	}
-
-	public void testFile69() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null, null);
-	}
-
-	public void testFile70() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null, null);
-	}
-
-	public void testFile71() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null, "text/html");
-	}
-
-	public void testFile72() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null, null);
-	}
-
-	public void testFile73() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null, "text/html");
-	}
-
-	public void testFile74() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null, null);
-	}
-
-	public void testFile75() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null, "text/html");
-	}
-
-	public void testFile76() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null, "text/html");
-	}
-
-	public void testFile77() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null, null);
-	}
-
-	public void testFile78() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null, "text/html");
-	}
-	public void nomalDirectiveCasewithXMLDecl() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp", null, "text/html");
-	}
-	public void testFile79() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null, "text/html");
-	}
-
-	public void testFile80() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null, "text/html");
-	}
-
-	public void testFile81() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", null, null);
-	}
-
-	public void testFile82() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
-	}
-
-	public void testFile83() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
-	}
-
-	public void testFile84() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null, null);
-	}
-
-	public void testFile85() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null, null);
-	}
-
-	public void testFile86() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null, null);
-	}
-
-	public void testFile87() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null, null);
-	}
-
-	public void testFile88() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null, null);
-	}
-
-	public void testFile89() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null, null);
-	}
-
-
-	public void testFile90() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null, "text/html");
-	}
-
-	public void testFile91() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null, null);
-	}
-
-	public void testFile92() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null, null);
-	}
-
-	public void testFile93() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null, null);
-	}
-
-	public void testFile94() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null, null);
-	}
-
-	public void testFile95() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null, null);
-	}
-
-	public void testFile96() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null, null);
-	}
-
-	public void testFile97() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null, null);
-	}
-
-	public void testFile98() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null, "text/html");
-	}
-
-	public void testFile99() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null, "text/html");
-	}
-	
-	public void testFile103() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le.jsp", null, "text/html");
-	}
-	
-	public void testFile104() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16be.jsp", null, "text/html");
-	}
-	
-	public void testFile105() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16BOM.jsp", null, null);
-	}
-
-	public void testFile106() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le_xmlStyle.jsp", null, null);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
deleted file mode 100644
index 8ed692ec2..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-	name="testsuite"
-	default="run"
-	basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-    
-    <property
-		name="plugin-name"
-		value="org.eclipse.jst.jsp.tests.encoding" />
-    <property
-        name="classname"
-        value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-	<property
-		name="library-file"
-		value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-    
-	<target name="init">
-        <tstamp />
-		<delete>
-			<fileset
-				dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-		</delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-
-		<ant
-			target="${testType}"
-			antfile="${library-file}"
-			dir="${eclipse-home}">
-			<property
-				name="data-dir"
-                value="${workspace}" />
-			<property
-				name="plugin-name"
-                value="${plugin-name}" />
-			<property
-				name="classname"
-				value="${classname}" />
-			<property
-				name="plugin-path"
-				value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-		    
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-		<!--<delete dir="${workspace}" quiet="true" />-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target
-		name="run"
-		depends="init,suite,cleanup">
-		<ant
-			target="collect"
-			antfile="${library-file}"
-			dir="${eclipse-home}">
-			<property
-				name="includes"
-                value="${plugin-name}.*xml" />
-			<property
-				name="output-file"
-				value="${plugin-name}.xml" />
-		</ant>
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75a3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15e7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australi�
-</tag>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d5d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australi�
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76ce8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e681a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248fe7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba82..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6a8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
-	background-color: #ffffff !important;
-}
-H1 {
-	color: #0000ff !important;
-	text-align: center !important;
-}
-TH {
-	text-align:left !important;
-	color: #000000 !important;
-	vertical-align: top !important;
-}
-TD {
-	text-align:left !important;
-	vertical-align: top !important;
-}
-TH.result {
-	background-color: #999999 !important;
-}
-TD.result {
-	background-color: #cccccc;
-	vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
-			<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_�\�Z�_</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_�\�Z�_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_�\�Z�_().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cfad..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652ab..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 88dbd6f45..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="/WEB-INF/tld/engine.tld" prefix="wps" %>
-<wps:constants/>
-
-<table>
-<tr><td><img alt="" title="" src='<%= wpsBaseURL %>/images/welcome_5.gif' border="0" align="left" /></td></tr>
-<tr><td>
-<span class="wpsTinyText"><b><%= Version.SERVER_NAME %> <%= Version.SERVER_VERSION %></b><br/>
-建置層次：<%= Version.BUILD_NUMBER %> <%= Version.BUILD_DATE %> <%= Version.BUILD_TIME %><br/>
-<br/>
-Licensed Materials - Property of IBM<br/>
-<%= Version.PRODUCT_NUMBER %><br/>
-(C) Copyright IBM Corp. <%= Copyright.YEARS %> All Rights Reserved.</span></td></tr>
-</table>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e304..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16ca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"  
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
deleted file mode 100644
index f9a22b49b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/html" %>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f15..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff9c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 76569028b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page 
-language="java"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f50..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a0802..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page 
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
deleted file mode 100644
index b1cb042be..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981c0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"  
-
-encoding="ISO-8859-3" 
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f49..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684f9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958c4..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"  abcd="efc"
-
-encoding="ISO-8859-1" 
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a4a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901e1..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b73..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8 
-<test>
-</test>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c1804..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0"    ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a77..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3bcc..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page 
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636fca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c89..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850f8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e81783..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
deleted file mode 100644
index 6ee242e58..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e691612..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d94..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc37..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
deleted file mode 100644
index bb72378b5..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
deleted file mode 100644
index 4873cbec6..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
deleted file mode 100644
index 5772f2f6e..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.classpath b/tests/org.eclipse.jst.jsp.ui.tests/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/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.ui.tests/.cvsignore b/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
deleted file mode 100644
index 3a5e93254..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-org.eclipse.jst.jsp.ui.tests_1.0.0.jar
-jspuitests.jar
-temp.folder
-PerformanceResults
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.project b/tests/org.eclipse.jst.jsp.ui.tests/.project
deleted file mode 100644
index 71a50f1c0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index f54d283cf..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,55 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.ui.tests; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-ClassPath: jspuitests.jar
-Bundle-Activator: org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.ui.tests,
- org.eclipse.jst.jsp.ui.tests.contentassist,
- org.eclipse.jst.jsp.ui.tests.contentassist.testfiles,
- org.eclipse.jst.jsp.ui.tests.contentdescription,
- org.eclipse.jst.jsp.ui.tests.document,
- org.eclipse.jst.jsp.ui.tests.examples,
- org.eclipse.jst.jsp.ui.tests.format,
- org.eclipse.jst.jsp.ui.tests.model,
- org.eclipse.jst.jsp.ui.tests.modelquery,
- org.eclipse.jst.jsp.ui.tests.other,
- org.eclipse.jst.jsp.ui.tests.pagedirective,
- org.eclipse.jst.jsp.ui.tests.partitioning,
- org.eclipse.jst.jsp.ui.tests.partitioning.testfiles.jsp,
- org.eclipse.jst.jsp.ui.tests.registry,
- org.eclipse.jst.jsp.ui.tests.search,
- org.eclipse.jst.jsp.ui.tests.threaded,
- org.eclipse.jst.jsp.ui.tests.util,
- org.eclipse.jst.jsp.ui.tests.validation,
- org.eclipse.jst.jsp.ui.tests.viewer
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.core,
- org.eclipse.jst.jsp.ui,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.html.core,
- org.eclipse.wst.css.core,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.ui,
- com.ibm.icu,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.validation,
- org.eclipse.core.commands,
- org.eclipse.core.expressions
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/about.html b/tests/org.eclipse.jst.jsp.ui.tests/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor�s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/build.properties b/tests/org.eclipse.jst.jsp.ui.tests/build.properties
deleted file mode 100644
index 874b2da83..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties
+++ /dev/null
@@ -1,22 +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 = plugin.xml,\
-               testfiles.zip,\
-               test.xml,\
-               projecttestfiles/,\
-               testfiles/,\
-               jspuitests.jar,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-jars.compile.order = jspuitests.jar
-source.jspuitests.jar = src/
-output.jspuitests.jar = bin/
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/rem_all_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/rem_all_co.gif
deleted file mode 100644
index ecd1be568..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/rem_all_co.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/resume_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/resume_co.gif
deleted file mode 100644
index 865279725..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/resume_co.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/suspend_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/suspend_co.gif
deleted file mode 100644
index e47777b5a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/dlcl16/suspend_co.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/rem_all_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/rem_all_co.gif
deleted file mode 100644
index 28a3785aa..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/rem_all_co.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/resume_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/resume_co.gif
deleted file mode 100644
index 16f4e2517..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/resume_co.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/suspend_co.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/suspend_co.gif
deleted file mode 100644
index 161e3f594..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/full/elcl16/suspend_co.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb858..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties b/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
deleted file mode 100644
index be2912a3c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-# properties file for org.eclipse.jst.jsp.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured Source Editor for JSP Tests
-view.name.0 = Embedded JSP Structured Text Viewer
-taglibview.name.0=TaglibIndex Delta Trace View
-_UI_SHOW_TRANSLATION=Show Translation
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml b/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
deleted file mode 100644
index cb2f47849..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.views">
-		<view
-			name="%view.name.0"
-			icon="$nl$/icons/sourceEditor.gif"
-			category="org.eclipse.wst.sse.ui.tests"
-			class="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP"
-			id="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP" />
-		<view
-			name="%taglibview.name.0"
-			icon="$nl$/icons/sourceEditor.gif"
-			category="org.eclipse.wst.sse.ui.tests"
-			class="org.eclipse.jst.jsp.ui.tests.TaglibIndexDeltaTraceView"
-			id="org.eclipse.jst.jsp.ui.tests.TaglibIndexDeltaTraceView" />
-	</extension>
-    <extension
-       point="org.eclipse.ui.commands">
-	    <command
-	          id="org.eclipse.jst.jsp.ui.showTranslation"
-	          name="%_UI_SHOW_TRANSLATION">
-	    </command>
-	</extension>
-	<extension point="org.eclipse.ui.bindings">
-      <!--  win32:  M1=CTRL,    M2=SHIFT, M3=ALT, M4=-
-            carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL
-            gtk: ? 
-      -->
-		<key
-			sequence="M1+M2+9"
-			contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			commandId="org.eclipse.jst.jsp.ui.showTranslation"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-	</extension>
-    <extension point="org.eclipse.ui.handlers">
-       <handler
-             class="org.eclipse.jst.jsp.ui.tests.ShowTranslationHandler"
-             commandId="org.eclipse.jst.jsp.ui.showTranslation">
-       </handler>
-	</extension>
-</plugin>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
deleted file mode 100644
index c50a9a9a6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
deleted file mode 100644
index 32204f27b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
deleted file mode 100644
index 773a303cc..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
deleted file mode 100644
index d0f7382f7..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPTranslationEditorInput.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.wst.sse.core.internal.util.DocumentInputStream;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * @author nitin
- * 
- */
-public class JSPTranslationEditorInput implements IStorageEditorInput {
-	private class JSPTranslationStorage implements IStorage {
-		/**
-		 * 
-		 */
-		public JSPTranslationStorage(IDOMModel jspModel) {
-			fModel = jspModel;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-		 */
-		public Object getAdapter(Class adapter) {
-			return fModel.getAdapter(adapter);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#getContents()
-		 */
-		public InputStream getContents() throws CoreException {
-			return new DocumentInputStream(getTranslationAdapter().getJSPTranslation().getJavaDocument());
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#getFullPath()
-		 */
-		public IPath getFullPath() {
-			return new Path(getTranslationAdapter().getJSPTranslation().getJavaPath());
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#getName()
-		 */
-		public String getName() {
-			return getTranslationAdapter().getJSPTranslation().getCompilationUnit().getElementName();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#isReadOnly()
-		 */
-		public boolean isReadOnly() {
-			return true;
-		}
-	}
-
-	IDOMModel fModel;
-
-	private JSPTranslationStorage fStorage;
-
-	/**
-	 * 
-	 */
-	public JSPTranslationEditorInput(IDOMModel model) {
-		fStorage = new JSPTranslationStorage(model);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return fModel.getAdapter(adapter);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return new Path(fModel.getBaseLocation()).lastSegment() + ".java";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IStorageEditorInput#getStorage()
-	 */
-	public IStorage getStorage() throws CoreException {
-		return fStorage;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return fModel.getBaseLocation();
-	}
-
-	JSPTranslationAdapter getTranslationAdapter() {
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) fModel.getDocument().getAdapterFor(IJSPTranslation.class);
-		return adapter;
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
deleted file mode 100644
index 4ec6fec1d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.internal.preferences.JSPUIPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * 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 JSPUIPreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.html.ui";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		} catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, JSPUIPreferenceNames.AUTO_PROPOSE);
-		bundleGetPreference(bundleName, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-
-		String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
-		assertNotSame("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue, value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
-		pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true));
-		pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE, "<=");
-	}
-
-	private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
-		String defaultValue = store.getDefaultString(prefKey);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, defaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
-		pluginSetPreferenceBoolean(store, JSPUIPreferenceNames.AUTO_PROPOSE);
-		pluginSetPreferenceString(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
-	}
-
-	private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
-		boolean originalValue = store.getBoolean(prefKey);
-		boolean expectedValue = !originalValue;
-		store.setValue(prefKey, expectedValue);
-		boolean foundValue = store.getBoolean(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-
-	private void pluginSetPreferenceString(IPreferenceStore store, String prefKey) {
-		String originalValue = store.getString(prefKey);
-		String expectedValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-		store.setValue(prefKey, expectedValue);
-		String foundValue = store.getString(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-	
-	public void testJavaSeverityPageIDsMatch() {
-		// used when linking from our JSP severity preference page to the Java severity preference page
-		assertEquals(org.eclipse.jdt.internal.ui.preferences.ProblemSeveritiesPreferencePage.PREF_ID,org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.JAVA_SEVERITY_PREFERENCE_PAGE);
-		assertEquals(org.eclipse.jdt.internal.ui.preferences.ProblemSeveritiesPreferencePage.PROP_ID,org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.JAVA_SEVERITY_PROPERTY_PAGE);
-		assertEquals(org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage.DATA_NO_LINK, org.eclipse.jst.jsp.ui.internal.preferences.ui.JSPValidationPreferencePage.DATA_NO_LINK);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestImages.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestImages.java
deleted file mode 100644
index 64e1eb162..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestImages.java
+++ /dev/null
@@ -1,43 +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.ui.tests;
-
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public final class JSPUITestImages {
-	private final static String ICONS_PATH = "icons/full/"; //$NON-NLS-1$
-
-	/* disabled */
-	private final static String DLCL = ICONS_PATH + "dlcl16/"; // $NON-NLS-1$
-	/* enabled */
-	private final static String ELCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$
-
-	// Images courtesy of org.eclipse.debug.ui
-	public static final String IMG_ELCL_SUSPEND = ELCL + "SUSPEND"; //$NON-NLS-1$
-	public static final String IMG_ELCL_RESUME = ELCL + "RESUME"; //$NON-NLS-1$
-	public static final String IMG_DLCL_SUSPEND = DLCL + "SUSPEND"; //$NON-NLS-1$
-	public static final String IMG_DLCL_RESUME = DLCL + "RESUME"; //$NON-NLS-1$
-	public static final String IMG_ELCL_REMOVE_ALL = ELCL + "CLEAR"; //$NON-NLS-1$
-	public static final String IMG_DLCL_REMOVE_ALL = DLCL + "CLEAR"; //$NON-NLS-1$
-
-	static void initializeImageRegistry(ImageRegistry reg) {
-		reg.put(IMG_ELCL_RESUME, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, ELCL + "resume_co.gif"));
-		reg.put(IMG_DLCL_RESUME, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, DLCL + "resume_co.gif"));
-
-		reg.put(IMG_ELCL_SUSPEND, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, ELCL + "suspend_co.gif"));
-		reg.put(IMG_DLCL_SUSPEND, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, DLCL + "suspend_co.gif"));
-
-		reg.put(IMG_ELCL_REMOVE_ALL, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, ELCL + "rem_all_co.gif"));
-		reg.put(IMG_DLCL_REMOVE_ALL, AbstractUIPlugin.imageDescriptorFromPlugin(JSPUITestsPlugin.ID, DLCL + "rem_all_co.gif"));
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
deleted file mode 100644
index 6cce0fadc..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
+++ /dev/null
@@ -1,68 +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.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.ui.tests.contentassist.BeanInfoProviderTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPJavaTranslatorTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPTranslationTest;
-import org.eclipse.jst.jsp.ui.tests.contentdescription.TestContentDescription;
-import org.eclipse.jst.jsp.ui.tests.document.FileBufferDocumentTester;
-import org.eclipse.jst.jsp.ui.tests.model.TestModelsFromFiles;
-import org.eclipse.jst.jsp.ui.tests.modelquery.ModelQueryTester;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.other.UnitTests;
-import org.eclipse.jst.jsp.ui.tests.pagedirective.TestPageDirective;
-import org.eclipse.jst.jsp.ui.tests.partitioning.TestStructuredPartitionerJSP;
-import org.eclipse.jst.jsp.ui.tests.registry.AdapterFactoryRegistryTest;
-import org.eclipse.jst.jsp.ui.tests.validation.JSPHTMLValidatorTest;
-import org.eclipse.jst.jsp.ui.tests.viewer.TestViewerConfigurationJSP;
-
-
-
-
-public class JSPUITestSuite extends TestSuite {
-	public static Test suite() {
-		return new JSPUITestSuite();
-	}
-
-	public JSPUITestSuite() {
-		super("SSE JSP UI Test Suite");
-		
-		addTest(new TestSuite(ScannerUnitTests.class, "ScannerUnitTests"));
-		addTest(new TestSuite(UnitTests.class, "UnitTests"));
-		addTest(new TestSuite(TestStructuredPartitionerJSP.class, "TestStructuredPartioner"));
-		addTest(new TestSuite(ModelQueryTester.class, "ModelQueryTester"));
-		addTest(new TestSuite(JSPJavaTranslatorTest.class, "JSPJavaTranslatorTest"));
-		addTest(new TestSuite(TestEmailNotice.class, "TestEmailNotice"));
-		addTest(new TestSuite(BeanInfoProviderTest.class, "BeanInfoProviderTest"));
-		addTest(new TestSuite(JSPTranslationTest.class, "JSPTranslationTest"));
-		addTest(new TestSuite(AdapterFactoryRegistryTest.class, "AdapterFactoryRegistryText"));
-		addTest(new TestSuite(JSPUIPreferencesTest.class));
-		addTest(new TestSuite(TestViewerConfigurationJSP.class));
-		addTest(new TestSuite(TestEditorConfigurationJSP.class));
-		
-		// moved from jsp core tests because they require UI
-		addTest(new TestSuite(TestPageDirective.class));
-		addTest(new TestSuite(FileBufferDocumentTester.class));
-		addTest(new TestSuite(TestModelClone.class));
-		
-		addTest(new TestSuite(TestModelsFromFiles.class, "TestModelsFromFiles"));
-		addTest(new TestSuite(TestModelEmbeddedContentType.class, "TestModelEmbeddedContentType"));
-
-		addTest(new TestSuite(TestContentDescription.class, "Content Description Tests"));
-		addTest(new TestSuite(JSPHTMLValidatorTest.class, "JSPHTMLValidatorTest"));
-		// pa_TODO fix this test
-		//addTest(new TestSuite(JSPSearchTests.class));
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
deleted file mode 100644
index f61d946ff..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
+++ /dev/null
@@ -1,102 +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.ui.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.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPUITestsPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static JSPUITestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	public static final String ID = "org.eclipse.jst.jsp.ui.tests";
-
-    /**
-	 * The constructor.
-	 */
-	public JSPUITestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.ui.tests.SSEForJSPTestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JSPUITestsPlugin 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 = JSPUITestsPlugin.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.ui.tests").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = FileLocator.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-	
-	public static File getTestFile(String filepath) {
-		URL installURL = getInstallLocation();
-		//String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		File result = new File(location);
-		return result;
-	}
-	
-	protected void initializeImageRegistry(ImageRegistry reg) {
-		super.initializeImageRegistry(reg);
-		JSPUITestImages.initializeImageRegistry(reg);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
deleted file mode 100644
index 22b107229..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
+++ /dev/null
@@ -1,144 +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.ui.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.jst.jsp.ui.tests"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
deleted file mode 100644
index c62116955..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.jsp.core.internal.java.IJSPProblem;
-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.JSPTranslationExtension;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-/**
- * Opens the current JSP editor's current translated source in a Java editor
- * 
- * Invoke with M1+M2+9
- * 
- * @author nitin
- */
-public class ShowTranslationHandler extends AbstractHandler {
-
-	/**
-	 * 
-	 */
-	public ShowTranslationHandler() {
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands
-	 * .ExecutionEvent)
-	 */
-	public Object execute(final ExecutionEvent event) throws ExecutionException {
-		// IDE.openEditor(event.getApplicationContext(), createEditorInput(),
-		// JavaUI.ID_CU_EDITOR, true);
-		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		if (selection instanceof IStructuredSelection) {
-			List list = ((IStructuredSelection) selection).toList();
-			if (!list.isEmpty()) {
-				if (list.get(0) instanceof IDOMNode) {
-					final IDOMModel model = ((IDOMNode) list.get(0)).getModel();
-					INodeAdapter adapter = model.getDocument().getAdapterFor(IJSPTranslation.class);
-					if (adapter != null) {
-						Job opener = new UIJob("Opening JSP Java Translation") {
-							public IStatus runInUIThread(IProgressMonitor monitor) {
-								JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-								final JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
-
-								// create an IEditorInput for the Java editor
-								final IStorageEditorInput input = new JSPTranslationEditorInput(model);
-								try {
-									IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), input, JavaUI.ID_CU_EDITOR, true);
-									// Now add the problems we found
-									if (editor instanceof ITextEditor) {
-										IAnnotationModel annotationModel = ((ITextEditor) editor).getDocumentProvider().getAnnotationModel(input);
-										translation.reconcileCompilationUnit();
-										List problemsList = translation.getProblems();
-										IProblem[] problems = (IProblem[]) problemsList.toArray(new IProblem[problemsList.size()]);
-										AnnotationTypeLookup lookup = new AnnotationTypeLookup();
-										for (int i = 0; i < problems.length; i++) {
-											if (problems[i] instanceof IJSPProblem)
-												continue;
-											int length = problems[i].getSourceEnd() - problems[i].getSourceStart() + 1;
-											Position position = new Position(problems[i].getSourceStart(), length);
-											Annotation annotation = null;
-											String type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_INFO);
-											if (problems[i].isError()) {
-												type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
-											}
-											else if (problems[i].isWarning()) {
-												type = lookup.getAnnotationType(IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
-											}
-											annotation = new Annotation(type, false, problems[i].getMessage());
-											if (annotation != null) {
-												annotationModel.addAnnotation(annotation, position);
-											}
-										}
-									}
-								}
-								catch (PartInitException e) {
-									e.printStackTrace();
-									Display.getCurrent().beep();
-								}
-								return Status.OK_STATUS;
-							}
-						};
-						opener.setSystem(false);
-						opener.setUser(true);
-						opener.schedule();
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TaglibIndexDeltaTraceView.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TaglibIndexDeltaTraceView.java
deleted file mode 100644
index e6ea06b7f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TaglibIndexDeltaTraceView.java
+++ /dev/null
@@ -1,400 +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.ui.tests;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsp.core.taglib.ITaglibIndexDelta;
-import org.eclipse.jst.jsp.core.taglib.ITaglibIndexListener;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndexDelta;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Sash;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-
-public class TaglibIndexDeltaTraceView extends ViewPart {
-
-	static final String MEM_LISTENING = "IS_LISTENING";
-	boolean isListening = false;
-
-	/**
-	 * Resumes listening to TaglibIndexDeltas
-	 */
-	private class ResumeAction extends Action {
-		public ResumeAction() {
-			super();
-			setText("Resume");
-			setImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_ELCL_RESUME));
-			setDisabledImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_DLCL_RESUME));
-		}
-
-		public void run() {
-			super.run();
-			TaglibIndex.addTaglibIndexListener(fInternalListener);
-			isListening = true;
-			fSuspendAction.setEnabled(true);
-			setEnabled(false);
-		}
-	}
-
-	/**
-	 * Stops listening to TaglibIndexDeltas
-	 */
-	private class SuspendAction extends Action {
-		public SuspendAction() {
-			setText("Suspend");
-			setImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_ELCL_SUSPEND));
-			setDisabledImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_DLCL_SUSPEND));
-		}
-
-		public void run() {
-			super.run();
-			TaglibIndex.removeTaglibIndexListener(fInternalListener);
-			isListening = false;
-			setEnabled(false);
-			fResumeAction.setEnabled(true);
-		}
-	}
-
-	/**
-	 * Empties deltas from viewer
-	 */
-	private class ClearAction extends Action {
-		public ClearAction() {
-			setText("Clear");
-			setImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_ELCL_REMOVE_ALL));
-			setDisabledImageDescriptor(JSPUITestsPlugin.getDefault().getImageRegistry().getDescriptor(JSPUITestImages.IMG_DLCL_REMOVE_ALL));
-		}
-
-		public void run() {
-			super.run();
-			fInput.clear();
-			fViewer.refresh();
-			setEnabled(false);
-		}
-	}
-
-	class TaglibIndexListener implements ITaglibIndexListener {
-		public void indexChanged(final ITaglibIndexDelta delta) {
-			getControl().getDisplay().syncExec(new Runnable() {
-				public void run() {
-					fInput.add(delta);
-					fViewer.refresh();
-					fViewer.setSelection(new StructuredSelection(delta));
-					fClearAction.setEnabled(true);
-				}
-			});
-		}
-	}
-
-	ITaglibIndexListener fInternalListener = null;
-
-	List fInput = new ArrayList();
-	TableViewer fViewer = null;
-	ResumeAction fResumeAction;
-	SuspendAction fSuspendAction;
-	IAction fClearAction;
-
-	public TaglibIndexDeltaTraceView() {
-		super();
-		fInternalListener = new TaglibIndexListener();
-	}
-
-	void showSelectionDetail(final Composite composite) {
-		IStructuredSelection selection = (IStructuredSelection) fViewer.getSelection();
-		if (!selection.isEmpty()) {
-			final TaglibIndexDelta selectedDelta = (TaglibIndexDelta) selection.getFirstElement();
-			final ITableLabelProvider tableLabelProvider = ((ITableLabelProvider) fViewer.getLabelProvider());
-			String columnText = tableLabelProvider.getColumnText(selectedDelta, 1);
-			columnText = columnText + ":" + tableLabelProvider.getColumnText(selectedDelta, 2);
-			new Dialog(composite.getShell()) {
-				public void create() {
-					setShellStyle(getShellStyle() | SWT.RESIZE);
-					super.create();
-				}
-
-				protected Control createDialogArea(final Composite parent) {
-					final Composite inner = new Composite(parent, SWT.NONE);
-					inner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-					final Sash sash = new Sash(inner, SWT.HORIZONTAL);
-
-					final TreeViewer treeViewer = new TreeViewer(inner);
-					treeViewer.setContentProvider(new ITreeContentProvider() {
-						public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-						}
-
-						public void dispose() {
-						}
-
-						public Object[] getElements(Object inputElement) {
-							return getChildren(inputElement);
-						}
-
-						public boolean hasChildren(Object element) {
-							return getChildren(element).length > 0;
-						}
-
-						public Object getParent(Object element) {
-							return selectedDelta;
-						}
-
-						public Object[] getChildren(Object parentElement) {
-							if (parentElement instanceof TaglibIndexDelta) {
-								TaglibIndexDelta taglibIndexDelta = ((TaglibIndexDelta) parentElement);
-								if (taglibIndexDelta.getTrigger() != null) {
-									List combined = new ArrayList();
-									combined.add(taglibIndexDelta.getTrigger());
-									combined.addAll(Arrays.asList(taglibIndexDelta.getAffectedChildren()));
-									return combined.toArray();
-								}
-								return taglibIndexDelta.getAffectedChildren();
-							}
-							return new Object[0];
-						}
-					});
-					treeViewer.setLabelProvider(new LabelProvider() {
-						public String getText(Object element) {
-							if (element instanceof ITaglibIndexDelta) {
-								ITaglibIndexDelta taglibIndexDelta = ((ITaglibIndexDelta) element);
-								if (taglibIndexDelta.getTaglibRecord() != null)
-									return taglibIndexDelta.toString();
-								String text = tableLabelProvider.getColumnText(selectedDelta, 1);
-								text = text + ":" + tableLabelProvider.getColumnText(selectedDelta, 2);
-								return text;
-							}
-							return StringUtils.firstLineOf(super.getText(element));
-						}
-					});
-					treeViewer.setInput(selectedDelta);
-
-					final Text text = new Text(inner, SWT.MULTI);
-
-					treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection2 = (IStructuredSelection) treeViewer.getSelection();
-							if (!selection2.isEmpty())
-								text.setText("" + (selection2).getFirstElement());
-							else
-								text.setText("");
-						}
-					});
-
-					final FormLayout form = new FormLayout();
-					inner.setLayout(form);
-
-					FormData firstData = new FormData();
-					firstData.top = new FormAttachment(0, 0);
-					firstData.bottom = new FormAttachment(sash, 2);
-					firstData.left = new FormAttachment(0, 0);
-					firstData.right = new FormAttachment(100, 0);
-					treeViewer.getControl().setLayoutData(firstData);
-
-					FormData secondData = new FormData();
-					secondData.top = new FormAttachment(sash, 2);
-					secondData.left = new FormAttachment(0, 0);
-					secondData.right = new FormAttachment(100, 0);
-					secondData.bottom = new FormAttachment(100, 0);
-					text.setLayoutData(secondData);
-
-					final FormData sashData = new FormData();
-					sashData.top = new FormAttachment(60, 0);
-					sashData.left = new FormAttachment(0, 0);
-					sashData.right = new FormAttachment(100, 0);
-					sash.setLayoutData(sashData);
-					sash.addListener(SWT.Selection, new org.eclipse.swt.widgets.Listener() {
-						public void handleEvent(Event e) {
-							sashData.top = new FormAttachment(0, e.y);
-							inner.layout();
-						}
-					});
-					return sash;
-				}
-			}.open();
-		}
-	}
-
-	public void createPartControl(final Composite parent) {
-		fViewer = new TableViewer(parent, SWT.SINGLE | SWT.FULL_SELECTION);
-		fViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				showSelectionDetail(parent);
-			}
-
-		});
-		fViewer.setContentProvider(new ArrayContentProvider());
-		fViewer.setLabelProvider(new ITableLabelProvider() {
-			public void removeListener(ILabelProviderListener listener) {
-			}
-
-			public boolean isLabelProperty(Object element, String property) {
-				return false;
-			}
-
-			public void dispose() {
-			}
-
-			public void addListener(ILabelProviderListener listener) {
-			}
-
-			public String getColumnText(Object element, int columnIndex) {
-				switch (columnIndex) {
-					case 0 : {
-						return Long.toString(((TaglibIndexDelta) element).getTime());
-					}
-					case 1 : {
-						String kind = null;
-						switch (((ITaglibIndexDelta) element).getKind()) {
-							case ITaglibIndexDelta.ADDED :
-								kind = "added";
-								break;
-							case ITaglibIndexDelta.REMOVED :
-								kind = "removed";
-								break;
-							case ITaglibIndexDelta.CHANGED :
-								kind = "changed";
-								break;
-						}
-						return kind;
-					}
-					case 2 :
-						return ((ITaglibIndexDelta) element).getProject().getName();
-					case 3 :
-						return ((TaglibIndexDelta) element).getTrigger().toString();
-				}
-				return "";
-			}
-
-			public Image getColumnImage(Object element, int columnIndex) {
-				return null;
-			}
-
-		});
-
-		String[] columnProperties = new String[]{"time", "Kind", "Project", "Trigger"};
-		TableLayout tlayout = new TableLayout();
-		CellEditor[] cellEditors = new CellEditor[columnProperties.length];
-		int columnWidths[] = new int[]{Display.getCurrent().getBounds().width / 14, Display.getCurrent().getBounds().width / 7, Display.getCurrent().getBounds().width / 7, Display.getCurrent().getBounds().width / 14, Display.getCurrent().getBounds().width / 7};
-		for (int i = 0; i < columnProperties.length; i++) {
-			tlayout.addColumnData(new ColumnWeightData(1));
-			TableColumn tc = new TableColumn(fViewer.getTable(), SWT.NONE);
-			tc.setText(columnProperties[i]);
-			tc.setResizable(true);
-			tc.setWidth(columnWidths[i]);
-		}
-		fViewer.setCellEditors(cellEditors);
-		fViewer.setColumnProperties(columnProperties);
-
-		fViewer.getTable().setHeaderVisible(true);
-		fViewer.getTable().setLinesVisible(true);
-		fViewer.setColumnProperties(columnProperties);
-
-		MenuManager contextMenuManager = new MenuManager();
-		contextMenuManager.setRemoveAllWhenShown(false);
-		contextMenuManager.add(new Action() {
-			public void run() {
-				super.run();
-				showSelectionDetail(parent);
-			}
-
-			public String getText() {
-				return "Details...";
-			}
-
-			public boolean isEnabled() {
-				return !fViewer.getSelection().isEmpty();
-			}
-		});
-
-		Menu contextMenu = contextMenuManager.createContextMenu(fViewer.getControl());
-		getControl().setMenu(contextMenu);
-
-		fViewer.setInput(fInput);
-	}
-
-	public void dispose() {
-		super.dispose();
-		TaglibIndex.removeTaglibIndexListener(fInternalListener);
-	}
-
-	Control getControl() {
-		return fViewer.getControl();
-	}
-
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-
-		boolean shouldListen = memento != null && Boolean.valueOf(memento.getString(MEM_LISTENING)).booleanValue();
-		if (shouldListen) {
-			TaglibIndex.addTaglibIndexListener(fInternalListener);
-			isListening = true;
-		}
-		fResumeAction = new ResumeAction();
-		fSuspendAction = new SuspendAction();
-		fClearAction = new ClearAction();
-		fSuspendAction.setEnabled(isListening);
-		fResumeAction.setEnabled(!isListening);
-
-		IToolBarManager mgr = site.getActionBars().getToolBarManager();
-		mgr.add(fResumeAction);
-		mgr.add(fSuspendAction);
-		mgr.add(fClearAction);
-	}
-
-	public void saveState(IMemento memento) {
-		super.saveState(memento);
-		memento.putString(MEM_LISTENING, Boolean.toString(isListening));
-	}
-
-	public void setFocus() {
-		fViewer.getControl().setFocus();
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java
deleted file mode 100644
index 90ae56176..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java
+++ /dev/null
@@ -1,55 +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 - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.internal.taginfo.JSPJavaJavadocHoverProcessor;
-import org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for jsp content type
- */
-public class TestEditorConfigurationJSP extends TestCase {
-	public void testGetSourceViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertNotNull("no source viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected source viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), StructuredTextViewerConfigurationJSP.class);
-	}
-
-	public void testGetContentOutlineViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertNotNull("no content outline viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), JSPContentOutlineConfiguration.class);
-	}
-
-	public void testGetPropertySheetConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertNotNull("no property sheet configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected property sheet configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), XMLPropertySheetConfiguration.class);
-	}
-	
-	public void testGetDocumentationTextHover() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOCUMENTATIONTEXTHOVER, IJSPPartitions.JSP_CONTENT_JAVA);
-		assertNotNull("no documentation text hover processor for " + IJSPPartitions.JSP_CONTENT_JAVA, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected documentation text hover processor for " + IJSPPartitions.JSP_CONTENT_JAVA, o.getClass(), JSPJavaJavadocHoverProcessor.class);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java
deleted file mode 100644
index 154156da6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java
+++ /dev/null
@@ -1,29 +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.ui.tests;
-
-import junit.framework.TestCase;
-
-public class TestEmailNotice extends TestCase {
-	private boolean sendNotifications = false;
-
-	public TestEmailNotice() {
-		super();
-	}
-
-	public TestEmailNotice(String name) {
-		super(name);
-	}
-
-	public void testEmail() {
-		assertFalse("Simple test to be sure email gets sent on failure", sendNotifications);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
deleted file mode 100644
index f6b3dd02f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
+++ /dev/null
@@ -1,612 +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.ui.tests;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.modelquery.JSPModelQueryAdapterImpl;
-import org.eclipse.jst.jsp.core.internal.modelquery.JSPModelQueryImpl;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML;
-import org.eclipse.wst.html.core.internal.modelquery.HTMLModelQueryImpl;
-//import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeFamilyForHTML;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.modelquery.XMLModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * 
- */
-public class TestModelClone extends TestCase {
-
-	private HashMap embeddedModelQueries = new HashMap();
-
-	/**
-	 * Constructor for TestModelClone.
-	 */
-	public TestModelClone(String name) {
-		super(name);
-	}
-
-	public static Test getTest() {
-		return new TestModelClone("testCreateStructuredModelJSP");
-	}
-
-	public void testCloneStructuredModelXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		assertTrue("model could not be created!", model != null);
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		//		if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
-		//		if (clonedModel.getParser() == model.getParser()) passed = false;
-		//		if (clonedModel.getReParser() == model.getReParser()) passed = false;
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-	public void testCloneStructuredModelHTML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertTrue("model could not be created!", model != null);
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		//		if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
-		//		if (clonedModel.getParser() == model.getParser()) passed = false;
-		//		if (clonedModel.getReParser() == model.getReParser()) passed = false;
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-	public void testCloneStructuredModelJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the embedded type is correct
-		boolean passed = true;
-		Document doc = ((IDOMModel) clonedModel).getDocument();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
-		assertNotNull("cloned model did not have embedded adapter", pageDirectiveAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-		assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
-		//		if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
-		//		if (clonedModel.getParser() == model.getParser()) passed = false;
-		//		if (clonedModel.getReParser() == model.getReParser()) passed = false;
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-	public void testCloneStructuredModelJSPXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-		// note, we initialy expect HTML, since there is not content
-		checkEmbeddedType(model, EmbeddedHTML.class);
-	
-		String testContent = "<%@ page contentType=\"text/xml\" %>";
-		model.getStructuredDocument().setText(this, testContent);
-	
-		// modified for design change, where re-init should be handled before 
-		// set returns.
-		assertTrue("model should not need reinit", !model.isReinitializationNeeded());
-	
-		//		but if it did need re-init, here's the right calling sequence		
-		//		if (model.isReinitializationNeeded()) {
-		//			model.aboutToChangeModel();
-		//			model = model.reinit();
-		//			model.changedModel();
-		//		}
-	
-		checkEmbeddedType(model, EmbeddedXML.class);
-	
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		checkEmbeddedType(clonedModel, EmbeddedXML.class);
-	
-	}
-
-	private void checkEmbeddedType(IStructuredModel model, Class expectedType) {
-		Document doc = ((IDOMModel) model).getDocument();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
-		assertNotNull("model did not have pageDirective", pageDirectiveAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-		assertNotNull("model did not have embedded handler", embeddedHandler);
-
-		assertEquals(expectedType, embeddedHandler.getClass());
-
-	}
-
-	public void testCreateStructuredModelJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-	
-		ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
-		factories = (ArrayList) factories.clone();
-	
-		IStructuredModel clonedModel = model.newInstance();
-		if (model.getModelHandler() == null) {
-			System.out.println();
-			assertTrue(false);
-		}
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are correct.
-	
-		ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		newFactories = (ArrayList) newFactories.clone();
-	
-		boolean passed = checkFactoriesListForIdentity(factories, newFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-	
-		passed = checkForSameEmbeddedFactories(model, clonedModel);
-		assertTrue("newInstance of structured model is not correct", passed);
-	
-		// Now, assigning some content shouldn't change the factories
-		clonedModel.getStructuredDocument().replaceText(this, 0, 0, "<sample> text");
-		ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		twoFactories = (ArrayList) twoFactories.clone();
-	
-		passed = checkFactoriesListForIdentity(factories, twoFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-	
-		passed = checkForSameEmbeddedFactories(model, clonedModel);
-		assertTrue("newInstance of structured model is not correct", passed);
-	
-	
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		clonedModel.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\"");
-		ArrayList threeFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		threeFactories = (ArrayList) threeFactories.clone();
-	
-		passed = checkFactoriesListForIdentity(factories, threeFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-	
-		passed = checkForSameEmbeddedFactories(model, clonedModel);
-		assertTrue("newInstance of structured model is not correct", passed);
-	
-	
-	}
-
-	public void testCreateStructuredModelJSPXHTML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-	
-	
-	
-	
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n" + 
-				"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\n" + 
-				"\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n" + 
-				"<%@page language=\"java\" contentType=\"text/xml; charset=ISO-8859-1\"\n" + 
-				"        pageEncoding=\"ISO-8859-1\"%>\n" + 
-				"<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" + 
-				"<head>\n" + 
-				"<meta http-equiv=\"Content-Type\" content=\"text/xml; charset=ISO-8859-1\" />\n" + 
-				"<style>\n" + 
-				"A { color: red; }\n" + 
-				"</style>\n" + 
-				"</head>\n" + 
-				"</html>\n" + 
-				"");
-	
-			checkEmbeddedType(model, EmbeddedHTML.class);
-			checkModelQuery(model, JSPModelQueryImpl.class);
-			checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-			
-			
-			
-			
-	}
-
-	public void testCreateStructuredModelJSPXHTMnoDoctype() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-	
-	
-	
-	
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n" + 
-				"<%@page language=\"java\" contentType=\"text/xml; charset=ISO-8859-1\"\n" + 
-				"        pageEncoding=\"ISO-8859-1\"%>\n" + 
-				"<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" + 
-				"<head>\n" + 
-				"<meta http-equiv=\"Content-Type\" content=\"text/xml; charset=ISO-8859-1\" />\n" + 
-				"<style>\n" + 
-				"A { color: red; }\n" + 
-				"</style>\n" + 
-				"</head>\n" + 
-				"</html>\n" + 
-				"");
-	
-			checkEmbeddedType(model, EmbeddedHTML.class);
-			checkModelQuery(model, JSPModelQueryImpl.class);
-			checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-			
-			
-			
-			
-	}
-
-	public void testCreateStructuredModelJSPXHTML2() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-
-
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n" + 
-					"<%@page language=\"java\" contentType=\"application/xml; charset=ISO-8859-1\"\n" + 
-					"        pageEncoding=\"ISO-8859-1\"%>\n" + 
-					"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\n" + 
-				"\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n" + 
-				"<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" + 
-				"<head>\n" + 
-				"<meta http-equiv=\"Content-Type\" content=\"application/xml; charset=ISO-8859-1\" />\n" + 
-				"<style>\n" + 
-				"A { color: red; }\n" + 
-				"</style>\n" + 
-				"</head>\n" + 
-				"</html>\n" + 
-				"");
-
-			checkEmbeddedType(model, EmbeddedHTML.class);
-			checkModelQuery(model, JSPModelQueryImpl.class);
-			checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-			
-			
-			
-			
-	}
-
-	private void checkModelQuery(IStructuredModel model, Class class1) {
-		Document doc = ((IDOMModel) model).getDocument();
-		ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) doc).getExistingAdapter(ModelQueryAdapter.class);
-		assertNotNull("model did not have modelQueryAdapter", modelQueryAdapter);
-		
-		assertTrue("modelQueryAdapter is wrong class", class1.equals(JSPModelQueryImpl.class));
-		
-	}
-
-	private void checkEmbeddedModelQuery(IStructuredModel model, Class outerQueryAdapter, Class outerQueryClass, Class embeddedQueryClass) {
-
-		Document doc = ((IDOMModel) model).getDocument();
-		ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) doc).getExistingAdapter(ModelQueryAdapter.class);
-		assertNotNull("model did not have modelQueryAdapter", modelQueryAdapter);
-
-		Class expected = outerQueryAdapter;
-		Class actual = modelQueryAdapter.getClass();
-		assertEquals("document's model query is not as expected", expected, actual);
-		
-		ModelQuery modelQuery = modelQueryAdapter.getModelQuery();
-		expected = outerQueryClass;
-		actual = modelQuery.getClass();
-		assertEquals("model query adapter's model query is not as expected", expected, actual);
-		
-		ModelQuery nodeQuery = getEmbeddedModelQuery(doc);
-		assertNotNull("node does not have a modelQueryAdapter", nodeQuery);
-		
-		expected = embeddedQueryClass;
-		actual = nodeQuery.getClass();
-		assertEquals("documents model query is not as expected", expected, actual);
-
-
-		
-	}
-
-	/**
-	 * Method checkEmbeddedFactories.
-	 * @param model
-	 * @param clonedModel
-	 * @return boolean
-	 */
-	private boolean checkForSameEmbeddedFactories(IStructuredModel model, IStructuredModel clonedModel) {
-		boolean result = true;
-
-
-		EmbeddedTypeHandler oldEmbeddedType = getEmbeddedType(model);
-		EmbeddedTypeHandler newEmbeddedType = getEmbeddedType(clonedModel);
-		// expect to be the same type
-		if (!oldEmbeddedType.getClass().equals(newEmbeddedType.getClass())) {
-			result = false;
-			assertTrue(result);
-		}
-
-		List oldFactories = oldEmbeddedType.getAdapterFactories();
-		List newFactories = newEmbeddedType.getAdapterFactories();
-		result = checkFactoriesListForEquivalence(oldFactories, newFactories);
-
-
-		return result;
-	}
-
-	private EmbeddedTypeHandler getEmbeddedType(IStructuredModel model) {
-		Document doc = ((IDOMModel) model).getDocument();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
-		assertNotNull("model did not have embedded adapter", pageDirectiveAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-		assertNotNull("model did not have embedded handler", embeddedHandler);
-
-		return embeddedHandler;
-	}
-
-
-	/**
-	 * Method checkFactoriesList.
-	 * @param factories
-	 * @param newFactories
-	 * @return boolean
-	 */
-	private boolean checkFactoriesListForIdentity(List factories, List newFactories) {
-		boolean result = true;
-		if (factories.size() != newFactories.size()) {
-			result = false;
-		}
-		else {
-			// nned not be identical, nor same order
-			//			for (int i = 0; i < factories.size(); i++) {
-			//				if (!(factories.get(i) == newFactories.get(i))) {
-			//					result = false;
-			//					break;
-			//				}
-			//			}
-		}
-		return result;
-	}
-
-	private boolean checkFactoriesListForEquivalence(List factories, List newFactories) {
-		boolean result = true;
-		if (factories.size() != newFactories.size()) {
-			result = false;
-		}
-		else {
-			for (int i = 0; i < factories.size(); i++) {
-				if (!factories.get(i).getClass().equals(newFactories.get(i).getClass())) {
-					result = false;
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-
-	public void testCreateStructuredModelHTML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertTrue("model could not be created!", model != null);
-
-		ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
-		factories = (ArrayList) factories.clone();
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are correct.
-
-		ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		newFactories = (ArrayList) newFactories.clone();
-
-		boolean passed = checkFactoriesListForIdentity(factories, newFactories);
-
-		assertTrue("newInstance of structured model is not correct", passed);
-
-		// Now, assigning some content shouldn't change the factories
-		clonedModel.getStructuredDocument().setText(this, "<sample> text");
-		ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		twoFactories = (ArrayList) twoFactories.clone();
-
-		passed = checkFactoriesListForIdentity(factories, newFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-	private ModelQuery getEmbeddedModelQuery(Node node) {
-		ModelQuery embeddedModelQuery = null;
-
-		if (node instanceof INodeNotifier) { 
-			Node ownerNode = node.getOwnerDocument();
-			if (ownerNode == null) {
-				// then must be the document itself
-				ownerNode = node; 
-			}
-			PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) ownerNode).getAdapterFor(PageDirectiveAdapter.class);
-			if (pageDirectiveAdapter != null) {
-
-				String effectiveContentType = null;
-				ModelQuery potentialModelQueryObject = null;
-
-				String familyId = pageDirectiveAdapter.getEmbeddedType().getFamilyId();
-				//if (ContentTypeFamilyForHTML.HTML_FAMILY.equals(familyId)) {
-				if ("org.eclipse.wst.html.core.contentfamily.html".equals(familyId)) {
-					effectiveContentType = "text/html";
-				}
-				else {
-					effectiveContentType = pageDirectiveAdapter.getContentType();
-				}
-				
-				potentialModelQueryObject = (ModelQuery) embeddedModelQueries.get(effectiveContentType);
-				
-				if (potentialModelQueryObject == null) {
-					ModelQueryAdapter embeddedAdapter = (ModelQueryAdapter) pageDirectiveAdapter.adapt((INodeNotifier) node, ModelQueryAdapter.class);
-					if (embeddedAdapter != null) {
-						// we will cache one model query per content type
-						embeddedModelQuery = embeddedAdapter.getModelQuery();
-						embeddedModelQueries.put(effectiveContentType, embeddedModelQuery);
-					}
-				}
-				else {
-					embeddedModelQuery = potentialModelQueryObject;
-				}
-			}
-		}
-		return embeddedModelQuery;
-	}
-
-	public void testCreateStructuredModelJSPXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-	
-	
-	
-	
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%-- keep JSP page compiler from generating code that accesses the session --%>\n" + 
-				"<%@ page session=\"false\"  contentType=\"text/xml; charset=ISO-8859-1\" %>\n" + 
-				"\n" + 
-				"<!-- load WPS portlet tag library and initialize objects -->\n" + 
-				"<%@ taglib uri=\"/WEB-INF/tld/portlet.tld\" prefix=\"portletAPI\" %>\n" + 
-				"<portletAPI:init /> \n" + 
-				"\n" + 
-				"<%-- Replace the name of the layout specified by the layoutName attribute of the canvas element below with the layout name for your portlet. --%>\n" + 
-				"<canvas xmlns =\"http://www.volantis.com/xmlns/marlin-cdm\" \n" + 
-				"        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" + 
-				"        layoutName=\"/sample_layout.mlyt\" \n" + 
-				"        type=\"portlet\" >\n" + 
-				"\n" + 
-				"\n" + 
-				"<%-- Specify the pane name from your layout policy as the value for the name attribute of the pane element below  --%>\n" + 
-				"<pane name=\"sample_pane\">\n" + 
-				"    <p>Hello!</p>\n" + 
-				"    <p>This is an XDIME <b>view mode</b> page . You have to edit this page to customize it for your own use.<br/><br/>\n" + 
-				"    The source file for this page is \"/Web Content/testportlet_legacy/jsp/xdime/TemplateLegacyPortletView.jsp\".\n" + 
-				"</p>\n" + 
-				"\n" + 
-				"<br/>\n" + 
-				"This is image 1    \n" + 
-				"<img src=\"/paw.mimg\" alt=\"noimg\" />\n" + 
-				"\n" + 
-				"<br/>\n" + 
-				"This is image 2    \n" + 
-				"<img src=\"paw.mimg\" alt=\"noimg\" />\n" + 
-				"\n" + 
-				"</pane>\n" + 
-				"</canvas>");
-	
-			checkEmbeddedType(model, EmbeddedXML.class);
-			checkModelQuery(model, JSPModelQueryImpl.class);
-			checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, XMLModelQueryImpl.class);
-			
-			
-			
-			
-	}
-
-	public void testCreateStructuredModelJSPWML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-	
-	
-	
-	
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/vnd.wap.wml\" %>\n" + 
-				"\n" + 
-				"  <jsp:useBean id=\"beanInstanceName\" scope=\"session\" class=\"package.class\" />\n" + 
-				"  <jsp:getProperty name=\"beanInstanceName\" property=\"*\" />\n" + 
-				"\n" + 
-				"  <?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + 
-				"  <!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.3//EN\" \"http://www.wapforum.org/DTD/wml13.dtd\">\n" + 
-				"  <wml>\n" + 
-				"\n" + 
-				"    <template>\n" + 
-				"      <!-- Template implementation here. -->\n" + 
-				"      <do type=\"prev\"><prev/></do>\n" + 
-				"    </template>\n" + 
-				"\n" + 
-				"  <%\n" + 
-				"  if (session.isNew() || session.getAttribute(\"userid\")==null ) {\n" + 
-				"  %>\n" + 
-				"    <card id=\"card1\" title=\"Card #1\">\n" + 
-				"\n" + 
-				"      <do type=\"unknown\" label=\"Next\">\n" + 
-				"        <go href=\"#card2\"/>\n" + 
-				"      </do>\n" + 
-				"      <p align=\"center\">\n" + 
-				"        <big><b>First Card</b></big>\n" + 
-				"      </p>\n" + 
-				"    </card>\n" + 
-				"\n" + 
-				"  <%\n" + 
-				"  } else {\n" + 
-				"  %>\n" + 
-				"    <card id=\"card2\" title=\"Card #2\">\n" + 
-				"\n" + 
-				"      <p align=\"center\">\n" + 
-				"        <big><b> <%= beanInstanceName.getUserid() %> </b></big>\n" + 
-				"      </p>\n" + 
-				"    </card>\n" + 
-				"  <%\n" + 
-				"  }\n" + 
-				"  %>\n" + 
-				"  </wml>");
-	
-			checkEmbeddedType(model, EmbeddedHTML.class);
-			checkModelQuery(model, JSPModelQueryImpl.class);
-			checkEmbeddedModelQuery(model, JSPModelQueryAdapterImpl.class, JSPModelQueryImpl.class, HTMLModelQueryImpl.class);
-			
-			
-			
-			
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
deleted file mode 100644
index 7adfab6a0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
+++ /dev/null
@@ -1,139 +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.ui.tests;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerUtility;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-
-/**
- * @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 TestModelEmbeddedContentType extends TestCase {
-
-	/**
-	 * Constructor for TestModelClone.
-	 */
-	public TestModelEmbeddedContentType(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-	}
-
-	public static Test getTest() {
-		return new TestModelEmbeddedContentType("testStructuredModelEmbeddedJSPChange");
-	}
-
-	protected void checkEmbeddedType(IStructuredModel clonedModel, Object expectedType) {
-		Document doc = ((IDOMModel) clonedModel).getDocument();
-		PageDirectiveAdapter embeddedTypeAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
-		assertNotNull("cloned model did not have embedded adapter", embeddedTypeAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = embeddedTypeAdapter.getEmbeddedType();
-		assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
-		assertTrue("cloned model embeddedHandler is wrong type", embeddedHandler.equals(expectedType));
-	}
-
-	public void testStructuredModelEmbeddedXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		assertTrue("model could not be created!", model != null);
-
-		// XML should NOT have an embedded type
-		Document doc = ((IDOMModel) model).getDocument();
-		EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
-		assertTrue("embededHanlder should be null for XML", embeddedHandler == null);
-
-	}
-
-	public void testStructuredModelEmbeddedHTML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertTrue("model could not be created!", model != null);
-
-		// should NOT have an embedded type
-		Document doc = ((IDOMModel) model).getDocument();
-		EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
-		assertTrue("embededHanlder should be null for HTML", embeddedHandler == null);
-
-	}
-
-	protected IStructuredModel doStructuredModelEmbeddedJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// should have an embedded type
-		Document doc = ((IDOMModel) model).getDocument();
-		PageDirectiveAdapter embeddedHandler = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
-		assertTrue("embededHanlder should NOT be null for JSP", embeddedHandler != null);
-
-		// embedded type should be HTML since no content
-		checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
-		String testContent = "<%@ page contentType=\"text/html\" %>";
-		model.getStructuredDocument().replaceText(this, 0, 0, testContent);
-		assertTrue("reinit should NOT be needed in this case", !model.isReinitializationNeeded());
-
-		// embedded type should STILL be HTML since no contentType was
-		// text/html
-		checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
-		return model;
-		//
-	}
-
-	public void testStructuredModelEmbeddedJSP() throws IOException {
-		doStructuredModelEmbeddedJSP();
-	}
-
-	public void testStructuredModelEmbeddedJSPChange() throws IOException {
-
-		// start with the full test case
-		IStructuredModel model = doStructuredModelEmbeddedJSP();
-		// change "html" to "xml"
-		model.getStructuredDocument().replaceText(this, 27, 4, "xml");
-		// with reinit in XML model ... its already been re-initialized
-		// assertTrue("reinit SHOULD be needed in this case",
-		// model.isReiniitializationNeeded());
-
-		if (model.isReinitializationNeeded()) {
-			model.reinit();
-		}
-
-		// embedded type should now be XML
-		checkEmbeddedType(model, ModelHandlerUtility.getEmbeddedContentTypeFor("text/xml"));
-
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
deleted file mode 100644
index 79360966c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
+++ /dev/null
@@ -1,231 +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.ui.tests.contentassist;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsp.ui.internal.contentassist.BeanInfoProvider;
-import org.eclipse.jst.jsp.ui.internal.contentassist.IJavaPropertyDescriptor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-
-/**
- * This class tests the BeanInfoProvider. Currently test workspace MUST point
- * to the specific one for this test.
- * 
- * @author pavery
- */
-public class BeanInfoProviderTest extends TestCase {
-	class OverwriteNone implements IOverwriteQuery {
-		public String queryOverwrite(String pathString) {
-			return IOverwriteQuery.ALL;
-		}
-	}
-
-	private IResource fResource;
-	private BeanInfoProvider fProvider;
-	private HashSet fAlreadyOpen = new HashSet();
-	private ProjectUnzipUtility fProjUtil = null;
-	private boolean fIsSetup = false;
-
-	public BeanInfoProviderTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (!this.fIsSetup) {
-			initializeResource();
-			this.fIsSetup = true;
-		}
-	}
-
-	private void initializeResource() throws Exception {
-		fProjUtil = new ProjectUnzipUtility();
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-		// platform location may be null -- depends on "mode" of platform
-		if (platformLocation != null) {
-			File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "beaninfo_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-			fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
-			fProjUtil.initJavaProject("BEANINFO");
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			String workspaceRelativeLocation = "/BEANINFO/BEAN_TESTS/beanInfo_test.jsp";
-			fResource = root.getFile(new Path(workspaceRelativeLocation));
-			IJavaProject javaProj = JavaCore.create(fResource.getProject());
-			openPath(javaProj);
-		}
-	}
-
-	protected File getSourceDirectory(String absoluteSourceDirectoryPath) {
-		File sourceDirectory = new File(absoluteSourceDirectoryPath);
-		if (!sourceDirectory.exists() || !sourceDirectory.isDirectory()) {
-			return null;
-		}
-		return sourceDirectory;
-	}
-
-	private void openPath(IJavaProject javaProj) {
-		try {
-			if (javaProj.exists() && !javaProj.isOpen()) {
-				javaProj.open(null);
-			}
-			IPackageFragmentRoot root = javaProj.getPackageFragmentRoot(fResource.getProject());
-			if (!root.isOpen())
-				root.open(null);
-			IPackageFragment frag = getPackageFragment(root, "BEAN_TESTS");
-			openAll(frag);
-			frag = getPackageFragment(root, "org");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-			frag = getPackageFragment(root, "org.eclipse");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-			frag = getPackageFragment(root, "org.eclipse.jst");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-			frag = getPackageFragment(root, "org.eclipse.jst.jsp");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-			frag = getPackageFragment(root, "org.eclipse.jst.jsp.ui");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-			frag = getPackageFragment(root, "org.eclipse.jst.jsp.ui.tests");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-		}
-		catch (JavaModelException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private IPackageFragment getPackageFragment(IPackageFragmentRoot root, String fragmentName) throws JavaModelException {
-		IPackageFragment frag = null;
-		IJavaElement[] children = root.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].getElementName().equals(fragmentName)) {
-				frag = (IPackageFragment) children[i];
-				break;
-			}
-		}
-		return frag;
-	}
-
-	private void openAll(IJavaElement javaElem) throws JavaModelException {
-		if (javaElem instanceof IOpenable) {
-			if (!((IOpenable) javaElem).isOpen())
-				((IOpenable) javaElem).open(null);
-		}
-		if (javaElem instanceof IParent && ((IParent) javaElem).hasChildren()) {
-			IJavaElement[] children = ((IParent) javaElem).getChildren();
-			for (int i = 0; i < children.length; i++) {
-				if (!fAlreadyOpen.contains(children[i].getElementName())) {
-					fAlreadyOpen.add(children[i].getElementName());
-					openAll(children[i]);
-				}
-			}
-		}
-	}
-
-	public void testAll() {
-		beanOnClasspath();
-		beanInProject();
-	}
-
-	private void beanOnClasspath() {
-		// pa_TODO don't use JButton, properties change
-		// use something more static
-		IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "javax.swing.JButton");
-		//		assertEquals("Number of properties for JButton:", 122, descriptors.length);
-		assertNotNull("descriptors shouldn't be null", descriptors);
-
-		//		List getOnly = new ArrayList();
-		//		List setOnly = new ArrayList();
-		//		List both = new ArrayList();
-		//		IJavaPropertyDescriptor jpd = null;
-		//		for (int i = 0; i < descriptors.length; i++) {
-		//			jpd = descriptors[i];
-		//			if (jpd.getReadable() && jpd.getWriteable())
-		//				both.add(jpd);
-		//			else if (jpd.getReadable() && !jpd.getWriteable())
-		//				getOnly.add(jpd);
-		//			else
-		//				setOnly.add(jpd);
-		//		}
-		//		assertEquals("Number of getOnly properties:", 62, getOnly.size());
-		//assertEquals("Number of setOnly properties:", 0, setOnly.size());
-		//assertEquals("Number of get & set properties that:", 59,
-		// both.size());
-	}
-
-	private void beanInProject() {
-		IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "org.eclipse.jst.jsp.ui.tests.BaseAlbumCollectionBean");
-		assertEquals("Number of properties for BaseAlbumCollectionBean:", 4, descriptors.length);
-		List getOnly = new ArrayList();
-		List setOnly = new ArrayList();
-		List both = new ArrayList();
-		IJavaPropertyDescriptor jpd = null;
-		for (int i = 0; i < descriptors.length; i++) {
-			jpd = descriptors[i];
-			if (jpd.getReadable() && jpd.getWriteable())
-				both.add(jpd);
-			else if (jpd.getReadable() && !jpd.getWriteable())
-				getOnly.add(jpd);
-			else
-				setOnly.add(jpd);
-		}
-		assertEquals("Number of getOnly properties:", 1, getOnly.size());
-		assertEquals("Number of setOnly properties:", 1, setOnly.size());
-		assertEquals("Number of get & set properties that:", 2, both.size());
-		// get only
-		jpd = (IJavaPropertyDescriptor) getOnly.get(0);
-		assertEquals("get readable for get only property: ", true, jpd.getReadable());
-		assertEquals("get writable for get only property:", false, jpd.getWriteable());
-		assertEquals("name for get only property", "numCds", jpd.getDisplayName());
-		assertEquals("type for get only property", "int", jpd.getDeclaredType());
-		// set only
-		jpd = (IJavaPropertyDescriptor) setOnly.get(0);
-		assertEquals("get readable for set only property: ", false, jpd.getReadable());
-		assertEquals("get writable for set only property:", true, jpd.getWriteable());
-		assertEquals("name for set only property", "cds", jpd.getDisplayName());
-		assertEquals("type for set only property", "String[]", jpd.getDeclaredType());
-		// both
-		jpd = (IJavaPropertyDescriptor) both.get(0);
-		assertEquals("get readable for both property: ", true, jpd.getReadable());
-		assertEquals("get writable for both property:", true, jpd.getWriteable());
-	}
-
-	private BeanInfoProvider getProvider() {
-		if (fProvider == null)
-			fProvider = new BeanInfoProvider();
-		return fProvider;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
deleted file mode 100644
index 3e99414a5..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
+++ /dev/null
@@ -1,119 +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.ui.tests.contentassist;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationUtil;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
-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.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * This class tests the sed JSPJavaTranslator class
- * 
- * @author pavery
- */
-public class JSPJavaTranslatorTest extends TestCase {
-
-	public JSPJavaTranslatorTest(String name) {
-		super(name);
-	}
-
-	public void testAllFiles() throws UnsupportedEncodingException, IOException {
-		// this test is for PMR: 91930 CMVC:218469
-		testJSPInJavascript("testfiles/jspInJavascript.jsp");
-	}
-
-	void testJSPInJavascript(String filename) throws UnsupportedEncodingException, IOException {
-		IStructuredModel sm = getStructuredModelForRead(filename);
-		if (sm != null) {
-			IDOMNode xmlNode = (IDOMNode) sm.getIndexedRegion(0);
-
-			if (xmlNode != null) {
-				JSPTranslator jspt = new JSPTranslator();
-				jspt.reset(xmlNode, null);
-				// int sourceTextPos = text.indexOf("<%= testJspString") + 17;
-				// jspt.setSourceCursor(sourceTextPos); // right after the
-				// text
-				jspt.translate();
-				String translation = jspt.getTranslation().toString();
-				// offsets are found using JSPTranslation now
-				// int translatedCursorPosition = jspt.getCursorPosition();
-				// assertEquals("incorrect cursor position >" +
-				// translatedCursorPosition, 519, translatedCursorPosition);
-				// assertEquals("translation was incorrect", "testJspString",
-				// translation.substring(519, 532));
-				int cursorStart = translation.indexOf("out.print(\"\"+\n testJspString") + 14;
-				assertEquals("incorrect cursor position >" + cursorStart, 667, cursorStart);
-			}
-			sm.releaseFromRead();
-		}
-	}
-
-	public void testMultipleJSPSectionsInJavascript() throws Exception {
-		String filename = "testfiles/jspInJavascript2.jsp";
-		IStructuredModel sm = getStructuredModelForRead(filename);
-		assertNotNull("couldn't load JSP for test", sm);
-		JSPTranslationUtil translationUtil = new JSPTranslationUtil(sm.getStructuredDocument());
-
-		String javaText = StringUtils.replace(translationUtil.getTranslation().getJavaText(), "\r\n", "\n");
-		javaText = StringUtils.replace(javaText, "\r", "\n");
-		sm.releaseFromRead();
-
-		String translatedText = loadContents("testfiles/jspInJavascript2.javasource");
-		assertEquals("translated contents are not as expected", translatedText, javaText);
-	}
-
-	/**
-	 * @return
-	 */
-	private String loadContents(String filename) throws IOException {
-		Reader reader = new InputStreamReader(getClass().getResourceAsStream(filename));
-		char[] readBuffer = new char[2048];
-		int n = reader.read(readBuffer);
-		StringBuffer s = new StringBuffer();
-		while (n > 0) {
-			s.append(readBuffer, 0, n);
-			n = reader.read(readBuffer);
-		}
-
-		String source = StringUtils.replace(s.toString(), "\r\n", "\n");
-		source = StringUtils.replace(source, "\r", "\n");
-		return source;
-	}
-
-	/**
-	 * IMPORTANT whoever calls this must releaseFromRead after they are done
-	 * using it.
-	 * 
-	 * @param filename
-	 * @return
-	 * @throws IOException
-	 * @throws UnsupportedEncodingException
-	 */
-	protected IStructuredModel getStructuredModelForRead(String filename) throws UnsupportedEncodingException, IOException {
-		// create model
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		IStructuredModel sModel = modelManager.getModelForRead(filename, inStream, null);
-		return sModel;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
deleted file mode 100644
index 87ad400bb..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
+++ /dev/null
@@ -1,438 +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.ui.tests.contentassist;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jst.jsp.core.internal.domdocument.DOMModelForJSP;
-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.modelhandler.ModelHandlerForJSP;
-import org.eclipse.jst.jsp.core.internal.provisional.JSP11Namespace;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.osgi.service.datalocation.Location;
-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;
-
-/**
- * This class unit tests the sed JSPTranslation mechanism.
- * That includes JSPTranslationAdapterFactory, JSPTranslationAdapter, and JSPTranslation.
- * It uses the jsp_include_test.jsp, because of the more complicated translation and offsets.
- * 
- * @author pavery
- */
-public class JSPTranslationTest extends TestCase {
-
-	private ProjectUnzipUtility fProjUtil = null;
-	private boolean isSetup = false;
-	
-	private HashMap fXMLJSPPositions;
-
-	public JSPTranslationTest(String name) {
-		super(name);
-	}
-	public JSPTranslationTest() {
-		super("JSPTranslationTest");
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (!this.isSetup) {
-			doSetup();
-			this.isSetup = true;
-		}
-	}
-
-	private void doSetup() throws Exception {
-		fProjUtil = new ProjectUnzipUtility();
-
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-
-		File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "includes_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-		fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
-		fProjUtil.initJavaProject("INCLUDES_TESTS");
-	}
-	
-	public void testPageDirectiveSessionVariableInFile() throws JavaModelException {
-		String jspTestFilePathString = "INCLUDES_TESTS/test189924.jsp";
-		ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/189924/test189924.jsp", jspTestFilePathString);
-		IPath jspTestFilePath = new Path(jspTestFilePathString);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-
-		verifyTranslationHasNoSessionVariables(file);
-	}
-	private void verifyTranslationHasNoSessionVariables(IFile file) throws JavaModelException {
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) getStructuredModelForRead(file);
-			setupAdapterFactory(model);
-
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-			ICompilationUnit cu = adapter.getJSPTranslation().getCompilationUnit();
-			cu.makeConsistent(new NullProgressMonitor());
-			IType[] types = cu.getAllTypes();
-			for (int i = 0; i < types.length; i++) {
-				IJavaElement[] members = types[i].getChildren();
-				for (int k = 0; k < members.length; k++) {
-					// check fields for name "session"
-					if (members[k].getElementType() == IJavaElement.FIELD) {
-						assertFalse("field named \"session\" exists", members[k].getElementName().equals(JSP11Namespace.ATTR_NAME_SESSION));
-					}
-					/*
-					 * check "public void
-					 * _jspService(javax.servlet.http.HttpServletRequest
-					 * request, javax.servlet.http.HttpServletResponse
-					 * response)" for local variables named "session"
-					 */
-					else if (members[k].getElementType() == IJavaElement.METHOD && members[k].getElementName().startsWith("_jspService")) {
-						ICompilationUnit compilationUnit = ((IMethod) members[k]).getCompilationUnit();
-						compilationUnit.makeConsistent(new NullProgressMonitor());
-						ASTParser parser = ASTParser.newParser(AST.JLS3);
-						parser.setSource(cu);
-						ASTNode node = parser.createAST(null);
-						node.accept(new ASTVisitor() {
-							public boolean visit(VariableDeclarationStatement node) {
-								Iterator fragments = node.fragments().iterator();
-								while (fragments.hasNext()) {
-									VariableDeclarationFragment fragment = (VariableDeclarationFragment) fragments.next();
-									if (fragment.getName().getFullyQualifiedName().equals(JSP11Namespace.ATTR_NAME_SESSION)) {
-										String typeName = ((SimpleType) node.getType()).getName().getFullyQualifiedName();
-										assertFalse("local variable of type \"javax.servlet.http.HttpSession\" and named \"session\" exists", typeName.equals("javax.servlet.http.HttpSession"));
-									}
-								}
-								return super.visit(node);
-							}
-						});
-					}
-				}
-			}
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-	
-	public void testPageDirectiveSessionVariableInSegment() throws JavaModelException {
-		String jspTestFilePathString = "INCLUDES_TESTS/test189924.jsp";
-		ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/189924/test189924.jsp", jspTestFilePathString);
-		jspTestFilePathString = "INCLUDES_TESTS/includer.jsp";
-		ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/189924/includer.jsp", jspTestFilePathString);
-		IPath jspTestFilePath = new Path(jspTestFilePathString);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-
-		verifyTranslationHasNoSessionVariables(file);	
-	}
-
-	public void testTranslatePositions() {
-
-		IDOMModel model = getIncludeTestModelForRead();
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-		JSPTranslation translation = adapter.getJSPTranslation();
-		try {
-			HashMap java2jsp = translation.getJava2JspMap();
-			assertEquals("java2jsp map size:", 11, java2jsp.size());
-
-			HashMap jsp2java = translation.getJsp2JavaMap();
-			assertEquals("jsp2java map size:", 3, jsp2java.size());
-
-			// some test positions (out.print("" + | );)
-			
-			// we need to ignore the classname length in our comparisons
-			// with java offsets that we get from the translation
-			// since it can vary depending on workspace location
-			int classnameLength = translation.getClassname().length();
-			
-			int jspTestPosition = translation.getJspText().indexOf("<%= ") + 4;
-			int javaOffset = translation.getJavaOffset(jspTestPosition) - classnameLength;
-			assertEquals("JSPTranslation java offset:", 1009, javaOffset);
-			
-			// (<%= | %>)
-			int javaTestPostition = translation.getJavaText().indexOf("out.print(\"\"+\n   \n);") + 14;
-			// dont' need to worry about classname length here because we are comparing
-			// with a position in the JSP document (which doesn't contain classname)
-			int jspOffset = translation.getJspOffset(javaTestPostition);
-			assertEquals("JSPTranslation jsp offset:", 564, jspOffset);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-
-	public void testJSPTranslationText() {
-
-		IDOMModel model = getIncludeTestModelForRead();
-		ScannerUnitTests.verifyLengths(model, model.getStructuredDocument().get());
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-		JSPTranslation translation = adapter.getJSPTranslation();
-		// named as .bin so no line conversion occurs (\n is in use)
-		InputStream in = getClass().getResourceAsStream("translated_text.bin");
-		String knownTranslationText = loadChars(in);
-		try {
-			// improvements: may need finer tuned text compares later
-			// for different types of translations (includes, xml-jsp in script, attributes, etc...)
-			String text = translation.getJavaText();
-			
-			assertNotNull("JSP translation text:", text);
-			assertEquals("JSP translation text does not match expected", knownTranslationText, text);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	public void testJSPTranslationAdapter() {
-		IDOMModel model = getIncludeTestModelForRead();
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-		JSPTranslation translation = adapter.getJSPTranslation();
-
-		try {
-			IJavaProject proj = adapter.getJavaProject();
-			assertNotNull("couldn't get java project:" + proj);
-
-			translation = adapter.getJSPTranslation();
-			assertNotNull("couldn't get translation:", translation);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	/**
-	 * Makes sure both beans are translated even though they are
-	 * right next to each other with no space.
-	 * 
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=103004
-	 */
-	public void testUseBeanNoSpace() {
-		IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/useBean_tester.jsp"));
-		DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
-		try {
-			setupAdapterFactory(sModel);
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
-			JSPTranslation translation = adapter.getJSPTranslation();
-			String javaText = translation.getJavaText();
-			boolean bean1 = javaText.indexOf("javax.swing.JButton x = null;") != -1;
-			boolean bean2 = javaText.indexOf("javax.swing.JButton y = null;") != -1;
-			assertTrue(bean1);
-			assertTrue(bean2);
-		}
-		finally {
-			if(sModel != null)
-				sModel.releaseFromRead();
-		}
-	}
-	
-	/**
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=86382
-	 */
-	public void testXMLJSPTranslationText() {
-		IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/xml-jsp/most-tags-xml-jsp.jsp"));
-		DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
-		try {
-			setupAdapterFactory(sModel);
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
-			JSPTranslation translation = adapter.getJSPTranslation();
-			
-			String javaText = translation.getJavaText();
-			
-			// named as .bin so no line conversion occurs (\n is in use)
-			InputStream in = getClass().getResourceAsStream("translated_xml_jsp.bin");
-			String knownTranslationText = loadChars(in);
-			
-			assertEquals(knownTranslationText, javaText);
-		}
-		finally {
-			if(sModel != null)
-				sModel.releaseFromRead();
-		}
-	}
-	
-	public void testXMLJSPMapping() {
-		IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/xml-jsp/most-tags-xml-jsp.jsp"));
-		DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
-		try {
-			setupAdapterFactory(sModel);
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
-			JSPTranslation translation = adapter.getJSPTranslation();
-			
-			HashMap jsp2java = translation.getJsp2JavaMap();
-			Object[] jspRanges = jsp2java.keySet().toArray();
-			Position jspPos = null;
-			Position javaPos = null;
-			for (int i = 0; i < jspRanges.length; i++) {
-				jspPos = (Position)jspRanges[i];
-				javaPos = (Position)jsp2java.get(jspPos);
-				//System.out.println("jsp:" + printPos(jspPos) + " >> java:" + printPos(javaPos));
-				checkPosition(jspPos, javaPos);
-			}
-		}
-		finally {
-			if(sModel != null)
-				sModel.releaseFromRead();
-		}
-	}
-	
-	public void testXMLJSPCDATAText() {
-		IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/cdata/cdata.jsp"));
-		DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
-		try {
-			setupAdapterFactory(sModel);
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
-			JSPTranslation translation = adapter.getJSPTranslation();
-			
-			String transText = translation.getJavaText();
-			
-//			 named as .bin so no line conversion occurs (\n is in use)
-			InputStream in = getClass().getResourceAsStream("translated_xml_jsp_cdata.bin");
-			String knownText = loadChars(in);
-			
-			assertEquals(knownText, transText);
-		}
-		finally {
-			if(sModel != null)
-				sModel.releaseFromRead();
-		}
-	}
-	
-	private void checkPosition(Position jspPos, Position javaPos) {
-		
-		HashMap expected = getXMLJSPPositions();
-		Object[] keys =expected.keySet().toArray();
-		Position expectedJspPos= null;
-		Position expectedJavaPos = null;
-		boolean found = false;
-		for (int i = 0; i < keys.length; i++) {
-			expectedJspPos = (Position)keys[i];
-			if(jspPos.equals(expectedJspPos)) {
-				expectedJavaPos = (Position)expected.get(expectedJspPos);
-				found = true;
-			}
-		}
-		assertTrue("expected JSP position missing: " + jspPos, found);
-		assertNotNull("no expected java position for jspPos: " + printPos(jspPos), expectedJavaPos);
-		assertEquals("unexpected java position for jsp position "+printPos(jspPos)+" was:" + printPos(javaPos) + " but expected:" + printPos(expectedJavaPos), javaPos, expectedJavaPos);
-	}
-	private String printPos(Position pos) {
-		return pos != null ? "[" + pos.offset +":"+ pos.length + "]" : "null";
-	}
-	private HashMap getXMLJSPPositions() {
-		if(fXMLJSPPositions == null) {
-			fXMLJSPPositions = new HashMap();
-			fXMLJSPPositions.put(new Position(882,52), new Position(920,31));
-			fXMLJSPPositions.put(new Position(961,7), new Position(952,7));
-			fXMLJSPPositions.put(new Position(1018,14), new Position(89,14));
-			fXMLJSPPositions.put(new Position(640,2), new Position(888,2));
-			fXMLJSPPositions.put(new Position(406,24), new Position(759,24));
-			fXMLJSPPositions.put(new Position(685,19), new Position(897,19));
-			fXMLJSPPositions.put(new Position(650,26), new Position(861,26));
-			fXMLJSPPositions.put(new Position(563,9), new Position(848,9));
-			fXMLJSPPositions.put(new Position(461,23), new Position(784,23));
-			fXMLJSPPositions.put(new Position(522,8), new Position(822,8));
-			fXMLJSPPositions.put(new Position(323,44), new Position(274,45));
-			fXMLJSPPositions.put(new Position(245,43), new Position(229,44));
-		}
-		return fXMLJSPPositions;
-	}
-	
-	private static String loadChars(InputStream input) {
-
-		StringBuffer s = new StringBuffer();
-		try {
-			int c = -1;
-			while ((c = input.read()) >= 0) {
-				if (c > 255)
-					break;
-				s.append((char) c);
-			}
-			input.close();
-		}
-		catch (IOException e) {
-			System.out.println("An I/O error occured while loading :");
-			System.out.println(e);
-		}
-		return s.toString();
-	}
-	
-	/**
-	 * add the factory for JSPTranslationAdapter here
-	 * @param sm
-	 */
-	private void setupAdapterFactory(IStructuredModel sm) {
-		ModelHandlerForJSP.ensureTranslationAdapterFactory(sm);
-	}
-
-	/**
-	 * IMPORTANT - release model (model.releaseFromRead()) after use
-	 * @param file
-	 * @return
-	 */
-	private IStructuredModel getStructuredModelForRead(IFile file) {
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			return modelManager.getModelForRead(file);
-		}
-		catch (IOException ioex) {
-			System.out.println("couldn't open file > " + file);
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private IDOMModel getIncludeTestModelForRead() {
-
-		IPath jspTestFilePath = new Path("INCLUDES_TESTS/jsp_include_test.jsp");
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-		IDOMModel xmlModel = (IDOMModel) getStructuredModelForRead(file);
-		setupAdapterFactory(xmlModel);
-		return xmlModel;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
deleted file mode 100644
index f8c7c028c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>pmr.jsp</TITLE>
-
-<%!String testJspString = "testJspString"; %>
-<script> 
-
-var test = <%= testJspString %>;
-
-</script>
-
-
-
-</HEAD>
-<BODY>
-<%  %>
-<P>Place jspInJavascript.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource
deleted file mode 100644
index 9e6543740..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.javasource
+++ /dev/null
@@ -1,36 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class _testfiles_2F_jspInJavascript2_2E_jsp extends javax.servlet.http.HttpServlet{
-String testJspString = "testJspString"; 
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
-		throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
-out.print(""+
- testJspString 
-);
-  
-
-        if( request.getAttribute("SoapURL") != null )
-        {
-        
-out.print(""+
- (String)request.getAttribute("SoapURL")
-);
-
-        }
-        else
-        { 
-        
- } 
- } catch (java.lang.Exception e) {} 
-}}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.jsp
deleted file mode 100644
index e63843c55..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript2.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>pmr.jsp</TITLE>
-
-<%!String testJspString = "testJspString"; %>
-<script> 
-
-var test = <%= testJspString %>;
-
-</script>
-
-
-
-</HEAD>
-<BODY>
-<%  %>
-<P>Place jspInJavascript2.jsp's content here.</P>
-   <script type="text/javascript">                      
-        <%
-        if( request.getAttribute("SoapURL") != null )
-        {
-        %>
-        var soapURL = "<%= (String)request.getAttribute("SoapURL")%>";
-        <%
-        }
-        else
-        { 
-        %>
-        var soapURL = document.location.href;
-   </script>
-<% } %>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
deleted file mode 100644
index 20eb369b0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
+++ /dev/null
@@ -1,37 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class __2F_INCLUDES_TESTS_2F_jsp_include_test_2E_jsp extends javax.servlet.http.HttpServlet{
- String argh = "argh"; 
-
- public String globalIncludedString = "included";
-
- protected String with_space = "withspace";
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
-		throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
- String localIncludedString = globalIncludedString;
-for(int i=0; i<5; i++) {
-out.print(""+
-i
-);
-}
-javax.swing.JButton BEAN_includedBean = new javax.swing.JButton();
- int include_include_int = 5; 
-javax.swing.JButton includesUseBean = new javax.swing.JButton();
-{ // <gifts:gift>
-} // </gifts:gift>
-out.print(""+
-   
-);
- } catch (java.lang.Exception e) {} 
-}}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
deleted file mode 100644
index 614ac0316..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
+++ /dev/null
@@ -1,35 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-import java.util.List;
-public class __2F_INCLUDES_TESTS_2F_xml_2D_jsp_2F_most_2D_tags_2D_xml_2D_jsp_2E_jsp extends javax.servlet.http.HttpServlet{
-public String myFunc() { return "myfunc"; }
-
-public String myFunc2() { return "myfunc"; }
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
-		throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
-String consec1 = "test";
-String consec2 = "two";
-out.print(""+
-myFunc()
-);
-out.print(""+
-myFunc2()
-);
-javax.swing.AbstractButton jb = new javax.swing.JButton();
-String includedString = "incd";
-   jb. 
-{ // <logic:iterate>
-} // </logic:iterate>
- } catch (java.lang.Exception e) {} 
-}}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
deleted file mode 100644
index 4657f589d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
+++ /dev/null
@@ -1,37 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class __2F_INCLUDES_TESTS_2F_cdata_2F_cdata_2E_jsp extends javax.servlet.http.HttpServlet{
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
-		throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-javax.servlet.http.HttpSession session = null;
-
-try {
-
-int a = 1;
-if (a 
-<
- 2) {
- out.println("x");
-} 
-   
-String test = "";
-
-
-   
-int a = 1;
-if (a < 2) {   
- out.println("x");
-}
-
-
- 
- test.toUpperCase();
- } catch (java.lang.Exception e) {} 
-}}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java
deleted file mode 100644
index a5f35464d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java
+++ /dev/null
@@ -1,157 +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.ui.tests.contentdescription;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.jsp.core.internal.Logger;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
-
-/**
- * Tests that our ContentDescriberForJSP is working as expected,
- * We check that the content description for a given input stream has all
- * of the appropriate properties.
- * (through the Platform content type framework)
- */
-public class TestContentDescription extends UnzippedProjectTester {
-
-	public void testNoXMLPIWithJSPSyntax() {
-		HashMap expectedProperties = new HashMap();
-		expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
-		expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
-		doTestContentDescription("/content-description/PurchaseOrder-no-XMLPI-jsp-syntax.jsp", expectedProperties);
-	}
-	
-	public void testWithXMLPIWithJSPSyntax() {
-		HashMap expectedProperties = new HashMap();
-		expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
-		expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
-		doTestContentDescription("/content-description/PurchaseOrder-with-XMLPI-jsp-syntax.jsp", expectedProperties);
-	}
-	
-	public void testWithXMLPIWithXMLSyntax() {
-		HashMap expectedProperties = new HashMap();
-		expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
-		expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
-		doTestContentDescription("/content-description/PurchaseOrder-with-XMLPI-xml-syntax.jsp", expectedProperties);
-	}
-	
-	public void testJSPWithHTMLOutput() {
-		HashMap expectedProperties = new HashMap();
-		expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/html");
-		doTestContentDescription("/content-description/html.jsp", expectedProperties);
-	}
-	
-	public void testJSPWithXHTMLOutput() {
-		HashMap expectedProperties = new HashMap();
-		expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xhtml");
-		doTestContentDescription("/content-description/xhtml.jsp", expectedProperties);
-	}
-	
-	public void testJSPWithXMLOutput() {
-		HashMap expectedProperties = new HashMap();
-		expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
-		doTestContentDescription("/content-description/xml.jsp", expectedProperties);
-	}
-	
-	private void doTestContentDescription(String filePath, HashMap expectedProperties) {
-		IContentDescription desc = getContentDescription(filePath);
-		assertNotNull("couldn't get IContentDescription for file:[" + filePath + "]", desc);
-		Object[] keys = expectedProperties.keySet().toArray();
-		for (int i = 0; i < keys.length; i++) {
-			
-			Object expected = expectedProperties.get(keys[i]);
-			Object detected = desc.getProperty( (QualifiedName)keys[i] );
-			assertEquals("unexpected property value", expected, detected);
-		}
-	}
-	
-	private IContentDescription getContentDescription(String filePath) {
-		if(filePath == null)
-			return null;
-	
-		InputStream in = null;
-		try {
-			// workspace file
-			IFile wsFile = FileBuffers.getWorkspaceFileAtLocation(new Path(filePath));
-			if(wsFile != null && wsFile.exists()) {
-				in = wsFile.getContents();
-			}
-			else {
-				// external file
-				File sFile = FileBuffers.getSystemFileAtLocation(new Path(filePath));
-				if(sFile !=null && sFile.exists())
-					in = new FileInputStream(sFile);
-			}
-		}
-		catch (CoreException e) {
-			Logger.logException(e);
-		}
-		catch (FileNotFoundException e) {
-			Logger.logException(e);
-		}
-		
-		assertNotNull(in);
-		
-		return getContentDescription(in);
-	}
-	
-	/**
-	 * Returns content description for an input stream
-	 * Assumes it's JSP content.
-	 * Closes the input stream when finished.
-	 * 
-	 * @param in
-	 * @return the IContentDescription for in
-	 */
-	private IContentDescription getContentDescription(InputStream in) {
-		
-		if(in == null)
-			return null;
-		
-		IContentDescription desc = null;
-		try {
-			
-			IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeID_JSP);
-			desc = contentTypeJSP.getDescriptionFor(in, IContentDescription.ALL);
-		}
-		catch (IOException e) {
-			Logger.logException(e);
-		}
-		finally {
-			if(in != null) {
-				try {
-					in.close();
-				}
-				catch (IOException e) {
-					Logger.logException(e);
-				}
-			}
-		}
-		return desc;
-	}
-	
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index e013669cf..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,312 +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.ui.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
-	private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		assertNotNull("Test Case in error. Could not find file " + filePath, file);
-		IPath locationPath = file.getLocation();
-		ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-		bufferManager.connect(locationPath, null);
-		ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
-		IDocument document = buffer.getDocument();
-		assertNotNull(document);
-		assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-		IDocumentPartitioner setupPartitioner = null;
-		if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-			setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-		}
-		else {
-			setupPartitioner = document.getDocumentPartitioner();
-		}
-		assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-		bufferManager.disconnect(locationPath, null);
-
-//		doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-		 
-	}
-
-
-
-/*
-
-	public void testFile103() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile104() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile105() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile106() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile107() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile108() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile109() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile110() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile111() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile112() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile113() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile114() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile115() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile116() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile117() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile118() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile119() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile120() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile121() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile122() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile123() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile124() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile125() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile126() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile127() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile128() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentXML() throws CoreException {
-		doTestCreateCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testSimpleCase() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	
-	public void testFile1() throws CoreException, IOException {
-		doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
-	}
-
-*/
-
-	public void testFile70() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile81() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile82() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile83() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile84() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile85() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile86() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile87() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile88() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile89() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile90() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile91() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile92() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile93() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile94() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile95() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile96() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile97() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile98() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile99() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile100() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile101() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile102() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-
-	public void testFile71() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile72() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile73() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile74() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile75() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile76() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile77() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile78() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile79() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile80() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index 08f1fddb7..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jst.jsp.ui.tests.document;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-
-/**
- * @author pavery
- */
-public class UnzippedProjectTester extends TestCase {
-
-	protected static IProject fTestProject;
-	private static boolean fTestProjectInitialized;
-	private static int nSetups = 0;
-	private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		nSetups++;
-		if (!fTestProjectInitialized) {
-			getAndCreateProject();
-			// unzip files to the root of workspace directory
-			String destinationProjectString = fTestProject.getLocation().toOSString();
-			String destinationFolder = destinationProjectString + "/";
-			// this zip file is sitting in the "root" of test plugin
-			File zipFile = JSPUITestsPlugin.getTestFile("testfiles.zip");
-			ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-			projUtil.unzipAndImport(zipFile, destinationFolder);
-			projUtil.initJavaProject(TEST_PROJECT_NAME);
-			fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-			fTestProjectInitialized = true;
-		}
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		nSetups--;
-		if (nSetups == 0) {
-			if (!DEBUG) {
-				//				Display display = PlatformUI.getWorkbench().getDisplay();
-				//				display.asyncExec(new Runnable() {
-				//					public void run() {
-				//						ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-				//						IProject proj = fTestProject;
-				//						fTestProject = null;
-				//						try {
-				//							projUtil.deleteProject(proj);
-				//						} catch (Exception e) {
-				//							e.printStackTrace();
-				//						}
-				//					}
-				//				});
-			}
-		}
-	}
-
-	private static final boolean DEBUG = false;
-
-	private static void getAndCreateProject() throws CoreException {
-		//TestsPlugin testsPlugin = (TestsPlugin)
-		// Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
-		IWorkspace workspace = getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		fTestProject = root.getProject(TEST_PROJECT_NAME);
-		// this form creates project as "linked" back to 'fileRoot'
-		//createProject(testProject, new Path(fileRoot), null);
-		createProject(fTestProject, null, null);
-		fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-		assertTrue(fTestProject.exists());
-		//		IContainer dotestFiles = testProject.getFolder("dotestFiles");
-		//		assertTrue(dotestFiles.exists());
-		//		IResource[] allFolders = dotestFiles.members();
-		//		assertNotNull(allFolders);
-	}
- 
-	private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("creating test project", 10);
-		// create the project
-		try {
-			if (!project.exists()) {
-				IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
-				if (Platform.getLocation().equals(locationPath)) {
-					locationPath = null;
-				}
-				desc.setLocation(locationPath);
-				project.create(desc, monitor);
-				monitor = null;
-			}
-			if (!project.isOpen()) {
-				project.open(monitor);
-				monitor = null;
-			}
-		}
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
deleted file mode 100644
index ceb218f73..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
+++ /dev/null
@@ -1,73 +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.ui.tests.examples;
-
-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.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.format.NodeFormatter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class CreatingJSPExpression extends TestCase {
-
-	/**
-	 * 
-	 */
-	public CreatingJSPExpression() {
-		super();
-	}
-
-	/**
-	 * @param name
-	 */
-	public CreatingJSPExpression(String name) {
-		super(name);
-	}
-
-	public void testCreateJSPExpression() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-
-		Document doc = ((IDOMModel) model).getDocument();
-
-		Element jspexpression = doc.createElement("jsp:expression");
-		((IDOMElement) jspexpression).setJSPTag(true);
-		doc.appendChild(jspexpression);
-		Text javacode = doc.createTextNode(" // some java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
-		jspexpression.appendChild(javacode);
-
-
-		Text cdatasection = doc.createCDATASection(" // some cdata java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
-		doc.appendChild(cdatasection);
-
-		// format's not needed, just prettier ... not sure why 
-		// it won't work right on whole document.
-		new NodeFormatter().format(jspexpression);
-		new NodeFormatter().format(cdatasection);
-		System.out.println("document text: ");
-		System.out.println(model.getStructuredDocument().get());
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/format/TestContentFormatter.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/format/TestContentFormatter.java
deleted file mode 100644
index d880b15da..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/format/TestContentFormatter.java
+++ /dev/null
@@ -1,171 +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.ui.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.formatter.FormattingContext;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IContentFormatterExtension;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.jst.jsp.ui.tests.util.StringCompareUtil;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class TestContentFormatter extends TestCase {
-	String wtp_autotest_noninteractive = null;
-	private static final String PROJECT_NAME = "jspformatting";
-	private static final String UTF_8 = "UTF-8";
-
-	private StringCompareUtil fStringCompareUtil;
-	private IFormattingContext fContext;
-
-	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()) {
-			ProjectUtil.createProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
-			ProjectUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
-		}
-		assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists());
-
-		fContext = new FormattingContext();
-		fContext.setProperty(FormattingContextProperties.CONTEXT_DOCUMENT, Boolean.valueOf(true));
-
-		fStringCompareUtil = new StringCompareUtil();
-	}
-
-	private void formatAndAssertEquals(String beforePath, String afterPath, boolean resetPreferences) throws UnsupportedEncodingException, IOException, CoreException {
-		IStructuredModel beforeModel = null, afterModel = null;
-		try {
-			beforeModel = getModelForEdit(beforePath);
-			assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
-			afterModel = getModelForEdit(afterPath);
-			assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
-			if (resetPreferences) {
-				resetPreferencesToDefault();
-			}
-
-			SourceViewerConfiguration configuration = new StructuredTextViewerConfigurationJSP();
-			IContentFormatterExtension formatter = (IContentFormatterExtension) configuration.getContentFormatter(null);
-
-			IDocument document = beforeModel.getStructuredDocument();
-			Region region = new Region(0, document.getLength());
-			fContext.setProperty(FormattingContextProperties.CONTEXT_REGION, region);
-			formatter.format(document, fContext);
-
-			ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
-			beforeModel.save(formattedBytes); // "beforeModel" should now be
-			// after the formatter
-
-			ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
-			afterModel.save(afterBytes);
-
-			String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
-			String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
-			assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
-		}
-		finally {
-			if (beforeModel != null)
-				beforeModel.releaseFromEdit();
-			if (afterModel != null)
-				afterModel.releaseFromEdit();
-		}
-	}
-
-	/**
-	 * must release model (from edit) after
-	 * 
-	 * @param filename
-	 *            relative to this class (TestFormatProcessorCSS)
-	 */
-	private IStructuredModel getModelForEdit(final String filename) {
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filename));
-		assertTrue("unable to find file: " + filename, file.exists());
-
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			model = modelManager.getModelForEdit(file);
-		}
-		catch (CoreException ce) {
-			ce.printStackTrace();
-		}
-		catch (IOException io) {
-			io.printStackTrace();
-		}
-		return model;
-	}
-
-	private void resetPreferencesToDefault() {
-		Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
-		preferences.setToDefault(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS);
-		preferences.setToDefault(HTMLCorePreferenceNames.LINE_WIDTH);
-		preferences.setToDefault(HTMLCorePreferenceNames.INDENTATION_CHAR);
-		preferences.setToDefault(HTMLCorePreferenceNames.INDENTATION_SIZE);
-		preferences.setToDefault(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
-	}
-
-	public void testFormatBug102495() throws UnsupportedEncodingException, IOException, CoreException {
-		String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495.jsp";
-		String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495-fmt.jsp";
-		formatAndAssertEquals(beforePath, afterPath, true);
-	}
-
-	public void testFormatBug102495_1() throws UnsupportedEncodingException, IOException, CoreException {
-		String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_1.jsp";
-		String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_1-fmt.jsp";
-		formatAndAssertEquals(beforePath, afterPath, true);
-	}
-
-	public void testFormatBug102495_2() throws UnsupportedEncodingException, IOException, CoreException {
-		String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_2.jsp";
-		String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_2-fmt.jsp";
-		formatAndAssertEquals(beforePath, afterPath, true);
-	}
-
-	public void testFormatBug102495_3() throws UnsupportedEncodingException, IOException, CoreException {
-		String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_3.jsp";
-		String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_3-fmt.jsp";
-		formatAndAssertEquals(beforePath, afterPath, true);
-	}
-
-	public void testFormatBug102495_4() throws UnsupportedEncodingException, IOException, CoreException {
-		String beforePath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_4.jsp";
-		String afterPath = "/" + PROJECT_NAME + "/WebContent/formatbug102495_4-fmt.jsp";
-		formatAndAssertEquals(beforePath, afterPath, true);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
deleted file mode 100644
index f248994ce..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,357 +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.ui.tests.model;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
-import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-public class TestModelsFromFiles extends UnzippedProjectTester {
-	public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentXMLDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNonExistentDocument("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentXMLModel() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreateModelWithNonExistIFile("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testNonExistentJSPDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNonExistentDocument("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testNonExistentJSPModel() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreateModelWithNonExistIFile("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmpty("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testSimpleDocumentCaseXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmptyDocument("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testSimpleDocumentCaseJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmptyDocument("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testComplexCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmpty("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testReload() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestReload("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testJSPWithXMLOutput() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestReload("testfiles/jsp/jsp-xml-output.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testXHTMLTransitional1() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/xhtml/testx.html", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
-	}
-
-	public void testXHTMLTransitional2() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/xhtml/testx.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testXHTMLTransitional3() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/xhtml/testx.xhtml", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
-	}
-
-	public void testHTMLTransitional1() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/html/testh.html", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
-	}
-
-	public void testHTMLTransitional2() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/html/testh.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	/*
-	 * TODO: these test files are missing, for some reason when running on
-	 * build machine ... need to re-construct public void testNearEmptyJSP()
-	 * throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-	 * doTestNotEmpty("testfiles/jsp/nearEmpty.jsp",
-	 * BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class); }
-	 * 
-	 * public void testNearEmptyXML() throws ResourceAlreadyExists,
-	 * ResourceInUse, IOException, CoreException {
-	 * doTestNotEmpty("testfiles/xml/nearEmpty.xml",
-	 * BasicStructuredDocument.class, StructuredTextPartitionerForXML.class); }
-	 * 
-	 * public void testNearEmptyHTML() throws ResourceAlreadyExists,
-	 * ResourceInUse, IOException, CoreException {
-	 * doTestNotEmpty("testfiles/html/nearEmpty.html",
-	 * BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class); }
-	 */
-	private void doTestNotEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = doTestCreate(filePath, expectedDocumentClass, expectedPartioner);
-		assertNotNull("contents were null", contents);
-		assertTrue("contents were empty", contents.length() > 0);
-
-	}
-
-	/**
-	 * @param string
-	 * @param class1
-	 * @param class2
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws ResourceInUse
-	 * @throws ResourceAlreadyExists
-	 */
-	private void doTestNotEmptyDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredDocument document = modelManager.createStructuredDocumentFor(file);
-		assertNotNull(document);
-		assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-		IDocumentPartitioner setupPartitioner = null;
-		if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-			setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-		}
-		else {
-			setupPartitioner = document.getDocumentPartitioner();
-		}
-		assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-		contents = document.get();
-		assertNotNull("contents were null", contents);
-		assertTrue("contents were empty", contents.length() > 0);
-
-	}
-
-	private void doTestNonExistentDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = null;
-		boolean expectedExceptionCaught = false;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredDocument document = null;
-		try {
-			document = modelManager.createStructuredDocumentFor(file);
-		}
-		catch (FileNotFoundException e) {
-			expectedExceptionCaught = true;
-		}
-
-		if (expectedExceptionCaught) {
-			document = modelManager.createNewStructuredDocumentFor(file);
-			assertNotNull(document);
-			assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-			IDocumentPartitioner setupPartitioner = null;
-			if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-				setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-			}
-			else {
-				setupPartitioner = document.getDocumentPartitioner();
-			}
-			assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-			contents = document.get();
-			assertNotNull("contents were null", contents);
-			assertTrue("contents were *not* empty as expected", contents.length() == 0);
-		}
-		else {
-			assertTrue("FileNotFound exception was *not* thrown as expected", false);
-		}
-
-	}
-
-	/**
-	 * @param string
-	 * @param class1
-	 * @param class2
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws ResourceInUse
-	 * @throws ResourceAlreadyExists
-	 */
-	private void doTestReload(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredModel model = modelManager.getNewModelForEdit(file, true);
-		try {
-			assertNotNull(model);
-			IStructuredDocument document = model.getStructuredDocument();
-			assertNotNull(document);
-			assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-			IDocumentPartitioner setupPartitioner = null;
-			if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-				setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-			}
-			else {
-				setupPartitioner = document.getDocumentPartitioner();
-			}
-			assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-
-			InputStream inStream = null;
-			try {
-				inStream = file.getContents();
-				model.reload(inStream);
-				assertNotNull(model);
-				IStructuredDocument documentReloaded = model.getStructuredDocument();
-				// note: NOT same instance of document
-				// FIXME: this test has to be changed back, once the reload
-				// API is
-				// fixed to work with different document.
-				// assertFalse(document == documentReloaded);
-				assertTrue(document == documentReloaded);
-			}
-			finally {
-				if (inStream != null) {
-					inStream.close();
-				}
-			}
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-
-	/**
-	 * @param string
-	 * @param class1
-	 * @param class2
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws ResourceInUse
-	 * @throws ResourceAlreadyExists
-	 */
-	private String doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		// file will be null if the resource does not exist
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredModel model = modelManager.getNewModelForEdit(file, true);
-		try {
-			assertNotNull(model);
-			IStructuredDocument document = model.getStructuredDocument();
-			assertNotNull(document);
-			contents = document.get();
-			assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-			IDocumentPartitioner setupPartitioner = null;
-			if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-				setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-			}
-			else {
-				setupPartitioner = document.getDocumentPartitioner();
-			}
-			assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-
-			testClone(model);
-
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-		return contents;
-	}
-
-	private void testClone(IStructuredModel structuredModel) throws IOException {
-		IDOMDocument document = ((IDOMModel) structuredModel).getDocument();
-		INodeNotifier notifier = document;
-		ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) notifier.getAdapterFor(ModelQueryAdapter.class);
-		assertNotNull("initial modelQueryAdapter should not be null", modelQueryAdapter);
-		
-		IStructuredModel newModel = structuredModel.newInstance();
-		IDOMDocument newDocument = ((IDOMModel) newModel).getDocument();
-		INodeNotifier newNotifier = newDocument;
-		ModelQueryAdapter result = (ModelQueryAdapter) newNotifier.getAdapterFor(ModelQueryAdapter.class);
-		assertNotNull("newInstance modelQueryAdapter should not be null", result);
-
-
-	}
-
-	/**
-	 * @param string
-	 * @param class1
-	 * @param class2
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws ResourceInUse
-	 * @throws ResourceAlreadyExists
-	 */
-	private String doTestCreateModelWithNonExistIFile(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		// file will be null if the resource does not exist
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredModel model = modelManager.getNewModelForEdit(file, false);
-		try {
-			assertNotNull(model);
-			IStructuredDocument document = model.getStructuredDocument();
-			assertNotNull(document);
-			contents = document.get();
-			assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-			IDocumentPartitioner setupPartitioner = null;
-			if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-				setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-			}
-			else {
-				setupPartitioner = document.getDocumentPartitioner();
-			}
-			assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-		}
-		finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-		return contents;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
deleted file mode 100644
index 87f8aa064..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
+++ /dev/null
@@ -1,390 +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.ui.tests.modelquery;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author pavery
- */
-public class ModelQueryTester extends TestCase {
-
-	private final boolean testShippedDTDLookup = false;
-
-	// Our Structured Model, which should always be an XMLModel (or subclass)
-	protected IDOMModel fModel = null;
-
-	protected ModelQuery fModelQuery = null;
-
-	public ModelQueryTester(String name) {
-		super(name);
-	}
-
-	protected static Test suite() {
-		return new TestSuite(ModelQueryTester.class);
-	}
-
-	public static void main(java.lang.String[] args) {
-		if (args == null || args.length == 0) {
-			runAll();
-		}
-		else if (args.length == 1) {
-			String methodToRun = args[0].trim();
-			runOne(methodToRun);
-		}
-
-	}
-
-	protected static void runAll() {
-		TestRunner.run(suite());
-
-	}
-
-	protected static void runOne(String methodName) {
-		TestSuite testSuite = new TestSuite();
-		TestCase test = new ModelQueryTester(methodName);
-		testSuite.addTest(test);
-		junit.textui.TestRunner.run(testSuite);
-	}
-
-	/**
-	 * Create an empty HTML model
-	 */
-	protected void setUpHTML() {
-		fModel = (IDOMModel) createModel(ContentTypeIdForHTML.ContentTypeID_HTML);
-		initVars();
-	}
-
-	/**
-	 * Create an empty XML model
-	 */
-	protected void setUpXML() {
-		fModel = (IDOMModel) createModel(ContentTypeIdForXML.ContentTypeID_XML);
-		initVars();
-	}
-
-
-	/**
-	 * Initialize local fields for this test
-	 */
-	protected void initVars() {
-		fModelQuery = ModelQueryUtil.getModelQuery(fModel.getDocument());
-
-
-	}
-
-	/**
-	 * Test the HTML BODY Element for the "bgcolor" attribute declaration
-	 */
-	public void testBodyElement() {
-		setUpHTML();
-		fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
-		// text
-
-		// TEST getting a CMElementDeclaration
-		Element bodyElement = (Element) fModel.getIndexedRegion(7); // node at
-		// offset7--should
-		// be
-		// <body>
-		CMElementDeclaration bodyDecl = fModelQuery.getCMElementDeclaration(bodyElement);
-
-		int contentType = bodyDecl.getContentType();
-		assertTrue("CMElementDeclaration CONTENT TYPE INCORRECT FOR BODY", (contentType == CMElementDeclaration.MIXED));
-
-		// get permissible attrs
-		CMNamedNodeMap map = bodyDecl.getAttributes();
-		assertTrue("ATTRIBUTES FROM ELEMENT DECLARATION == NULL", (map != null));
-		Vector allowed = new Vector();
-		for (int i = 0; i < map.getLength(); i++) {
-			CMAttributeDeclaration node = (CMAttributeDeclaration) map.item(i);
-			String name = node.getNodeName();
-			allowed.add(name);
-			if (name.equalsIgnoreCase("bgcolor")) {
-				assertTrue("GOT INCORRECT ATTRIBUTE NODE TYPE", (node.getNodeType() == CMNode.ATTRIBUTE_DECLARATION));
-
-				CMDataType attrType = node.getAttrType();
-				// System.out.println("attribute type > " + attrType);
-				assertTrue("COULD NOT GET ATTRIBUTE TYPE", (attrType != null));
-				assertTrue("COULDN'T GET IMPLIED VALUE KIND", (attrType.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_NONE));
-			}
-		}
-	}
-
-	/**
-	 * Test the HTML HTML Element for its declared children
-	 */
-	public void testHtmlChildren() {
-		setUpHTML();
-		fModel.getStructuredDocument().set("<html></html>"); // set text
-		Element htmlElement = fModel.getDocument().getDocumentElement();
-		CMElementDeclaration htmlDecl = fModelQuery.getCMElementDeclaration(htmlElement);
-
-		// HTML's children are within a group
-		CMContent contents = htmlDecl.getContent();
-
-		assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
-		CMGroup group = (CMGroup) contents;
-		int operator = group.getOperator();
-		CMNodeList childList = group.getChildNodes();
-		int max = contents.getMaxOccur();
-		int min = contents.getMinOccur();
-
-		// the group should be allowed once, with a sequence whose first entry
-		// is the declaration for HEAD
-		assertTrue("occurrance of group", min == 1 && max == 1);
-		assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
-		assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
-		assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equalsIgnoreCase(HTML40Namespace.ElementName.HEAD));
-
-		assertTrue("content descriptor type, position 1", childList.item(1).getNodeType() == CMNode.GROUP);
-		// The second child should be a group as well, containing BODY and
-		// FRAMESET with an
-		// operator of CMGroup.CHOICE
-		assertTrue("content descriptor type, position 1 - relationship of group", ((CMGroup) childList.item(1)).getOperator() == CMGroup.CHOICE);
-	}
-
-	public void testFormMethodAttr() {
-		setUpHTML();
-		fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
-		// text
-
-		// TEST GETTING A CMAttributeDeclaratoin
-		Element formElement = (Element) fModel.getIndexedRegion(31); // <form>
-		Attr attrNode = formElement.getAttributeNode(HTML40Namespace.ATTR_NAME_METHOD);
-		CMAttributeDeclaration methodAttrDecl = fModelQuery.getCMAttributeDeclaration(attrNode);
-		assertTrue("Content Model missing the attribute declaration for \"method\"", methodAttrDecl != null);
-
-		List values = getValidStrings(formElement, methodAttrDecl);
-		assertTrue("wrong number of values for attribute \"method\"", (values.size() == 2));
-		assertTrue("default value for attribute \"method\" is wrong", (methodAttrDecl.getAttrType().getImpliedValue().equalsIgnoreCase("get")));
-	}
-
-	/**
-	 * A short test to ensure that a DTD can be loaded from a system
-	 * reference.
-	 * 
-	 * Note: May require a functioning network connection for the references
-	 * to be resolved properly.
-	 * 
-	 * @throws IOException
-	 */
-	public void testDTDLoadFromSystemID_1() throws IOException {
-		if (testShippedDTDLookup) {
-			setUpXML();
-			URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
-			String diskLocation = null;
-			diskLocation = FileLocator.resolve(installationPath).toExternalForm();
-
-			assertTrue("failed to resolve plugin install path", diskLocation != null);
-			String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "TestFiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd\"" + "><html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:wml=\"http://www.wapforum.org/2001/wml\"></html>";
-			fModel.getStructuredDocument().set(content);
-			CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
-			Node domNode = (Node) fModel.getIndexedRegion(content.length() - 2);
-			CMNode node = fModelQuery.getCMNode(domNode);
-			assertTrue("wml20.dtd failed to load", node != null && node.getNodeName().equalsIgnoreCase("html"));
-		}
-	}
-
-
-	/**
-	 * A short test to ensure that a DTD, the XHTML 1.0 Transitional one, can
-	 * be loaded from a system reference.
-	 * 
-	 * Note: May require a functioning network connection for the references
-	 * to be resolved properly.
-	 * @throws IOException 
-	 */
-	public void testDTDLoadFromSystemID_2() throws IOException {
-		if (testShippedDTDLookup) {
-			URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
-			String diskLocation = null;
-
-			diskLocation = FileLocator.resolve(installationPath).toExternalForm();
-
-			assertTrue("failed to resolve plugin install path", diskLocation != null);
-			setUpXML();
-			String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "testfiles/XHTML/xhtml1-transitional.dtd\"" + "><html></html>";
-			fModel.getStructuredDocument().set(content);
-
-			CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
-			// see defect 282429
-			CMElementDeclaration htmlDecl = (CMElementDeclaration) fModelQuery.getCMNode((Node) fModel.getIndexedRegion(content.length() - 2));
-			assertTrue("xhtml1-transitional.dtd not loaded", htmlDecl != null);
-
-			// HTML's children are within a group
-			CMContent contents = htmlDecl.getContent();
-
-			assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
-			CMGroup group = (CMGroup) contents;
-			int operator = group.getOperator();
-			CMNodeList childList = group.getChildNodes();
-			int max = contents.getMaxOccur();
-			int min = contents.getMinOccur();
-
-			// the group should be allowed once, with a sequence whose first
-			// entry
-			// is the declaration for HEAD
-			assertTrue("occurrance of group", min == 1 && max == 1);
-			assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
-			assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
-			assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equals(HTML40Namespace.ElementName.HEAD.toLowerCase()));
-			assertTrue("child order (BODY second)", childList.item(1).getNodeName().equals(HTML40Namespace.ElementName.BODY.toLowerCase()));
-		}
-	}
-
-	/**
-	 * A short test to ensure that the DTD for JSP 1.2 tag libraries can be
-	 * loaded from a public reference registered in the XML catalog
-	 */
-	public void testDTDLoadFromPublicID() {
-		// No longer provided in WTP
-		// TODO: provide DTD?
-		// if (testShippedDTDLookup) {
-		// setUpXML();
-		// String contents = "<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems,
-		// Inc.//DTD JSP Tag Library 1.2//EN\">
-		// <taglib><tag>foo</tag></taglib>";
-		// fModel.getStructuredDocument().set(contents);
-		//
-		// CMDocumentManager documentManagaer =
-		// fModelQuery.getCMDocumentManager();
-		// documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD,
-		// false);
-		// documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD,
-		// true);
-		//
-		//
-		// // taglib
-		// CMNode node = fModelQuery.getCMNode((Node)
-		// fModel.getIndexedRegion(contents.length() - 2));
-		// assertTrue("web-jsptaglibrary_1_2.dtd failed to load through
-		// catalog", node != null && node.getNodeType() ==
-		// CMNode.ELEMENT_DECLARATION &&
-		// node.getNodeName().equalsIgnoreCase("taglib"));
-		//
-		// // tag
-		// node = fModelQuery.getCMNode((Node)
-		// fModel.getIndexedRegion(contents.length() - 12));
-		// assertTrue("CMElementDeclaration for \"tag\" from
-		// web-jsptaglibrary_1_2.dtd is missing", node != null &&
-		// node.getNodeType() == CMNode.ELEMENT_DECLARATION &&
-		// node.getNodeName().equalsIgnoreCase("tag"));
-		// CMContent content = ((CMElementDeclaration) node).getContent();
-		// assertTrue("only one occurrence of child group allowed",
-		// content.getNodeType() == CMNode.GROUP && content.getMaxOccur() ==
-		// 1);
-		// }
-	}
-
-
-
-	public static IStructuredModel createModel(String contentTypeID) {
-		// create an empty model with its default factories
-		IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-
-		// add editor adapter factories
-		AdapterFactoryRegistry adapterRegistry = JSPUIPlugin.getDefault().getAdapterFactoryRegistry();
-		Iterator adapterList = adapterRegistry.getAdapterFactories();
-		// And all those appropriate for this particular type of content
-		while (adapterList.hasNext()) {
-			try {
-				AdapterFactoryProvider provider = (AdapterFactoryProvider) adapterList.next();
-				if (provider.isFor(model.getModelHandler())) {
-					provider.addAdapterFactories(model);
-				}
-			}
-			catch (Exception e) {
-				Logger.logException(e);
-			}
-		}
-		return model;
-	}
-
-	/**
-	 * Return the valid values for an attribute with the given declaration on
-	 * the given element. Derived from XMLPropertySource
-	 */
-	private List getValidStrings(Element element, CMAttributeDeclaration attrDecl) {
-		CMDataType valuesHelper = attrDecl.getAttrType();
-		Vector values = new Vector();
-
-		if (valuesHelper.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED && valuesHelper.getImpliedValue() != null) {
-			// FIXED value
-			values.add(valuesHelper.getImpliedValue());
-		}
-		else {
-			// ENUMERATED values
-			String[] valueStrings = null;
-			// new way
-			valueStrings = fModelQuery.getPossibleDataTypeValues(element, attrDecl);
-			if (valueStrings == null)
-				// older way
-				valueStrings = attrDecl.getAttrType().getEnumeratedValues();
-			if (valueStrings != null) {
-				for (int i = 0; i < valueStrings.length; i++) {
-					values.add(valueStrings[i]);
-				}
-			}
-		}
-		if (valuesHelper.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE && valuesHelper.getImpliedValue() != null) {
-			if (!values.contains(valuesHelper.getImpliedValue()))
-				values.add(valuesHelper.getImpliedValue());
-		}
-
-		return values;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
deleted file mode 100644
index 82eccdf94..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
+++ /dev/null
@@ -1,59 +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.ui.tests.other;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/21/00 4:14:40 PM)
- * @author: David Williams
- */
-public class ColorRegions extends java.util.Vector {
-	/**
-	 * Default <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * ColorRegions constructor comment.
-	 */
-	public ColorRegions() {
-		super();
-	}
-
-	/**
-	 * ColorRegions constructor comment.
-	 * @param initialCapacity int
-	 */
-	public ColorRegions(int initialCapacity) {
-		super(initialCapacity);
-	}
-
-	/**
-	 * ColorRegions constructor comment.
-	 * @param initialCapacity int
-	 * @param capacityIncrement int
-	 */
-	public ColorRegions(int initialCapacity, int capacityIncrement) {
-		super(initialCapacity, capacityIncrement);
-	}
-
-	public int[] asIntArray() {
-		trimToSize();
-		int arraySize = elementData.length;
-		int[] results = new int[arraySize];
-		//
-		for (int i = 0; i < arraySize; i++) {
-			results[i] = ((Integer) elementData[i]).intValue();
-		}
-		//
-		return results;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
deleted file mode 100644
index e2ffeec6b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
+++ /dev/null
@@ -1,104 +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.ui.tests.other;
-
-import java.io.PrintStream;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class DebugDocument {
-
-	public static void dump(Document document) {
-		if (document == null)
-			return;
-		System.out.println("Dump of DOM"); //$NON-NLS-1$
-
-		dump(document, System.out);
-
-		//
-		System.out.println();
-		System.out.println("= = = = = ="); //$NON-NLS-1$
-		System.out.println();
-
-	}
-
-	public static void dump(Document document, PrintStream out) {
-		Node node = document.getFirstChild();
-		while (node != null) {
-			dump(node, out);
-			node = node.getNextSibling();
-		}
-
-	}
-
-	public static void dump(Node topNode) {
-		dump(topNode, System.out);
-	}
-
-	public static void dump(Node topNode, PrintStream out) {
-		if (topNode == null)
-			return;
-		// print out this node
-		//
-		printNode(topNode, out);
-
-		// now print out its children
-		//NodeList nodes = topNode.getChildNodes();
-		//int len = nodes.getLength();
-		//for (int i = 0; i < len; i++) {
-
-		//Node node = nodes.item(i);
-		//dump(node, out);
-		//}
-	}
-
-	public static void printNode(Node topNode) {
-		printNode(topNode, System.out);
-
-	}
-
-	public static void printNode(Node topNode, PrintStream out) {
-		// print out this node
-		//
-		IStructuredDocumentRegion firstStructuredDocumentRegion = ((IDOMNode) topNode).getFirstStructuredDocumentRegion();
-		IStructuredDocumentRegion lastStructuredDocumentRegion = ((IDOMNode) topNode).getLastStructuredDocumentRegion();
-		if ((firstStructuredDocumentRegion == null) || (lastStructuredDocumentRegion == null)) {
-			// no text to output
-		} else {
-			int start = firstStructuredDocumentRegion.getStart();
-			int end = lastStructuredDocumentRegion.getEnd();
-
-			String outString = topNode.toString();
-			outString = org.eclipse.wst.sse.core.utils.StringUtils.escape(outString);
-			out.println("[" + start + ", " + end + "]" + outString); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		}
-		// now do its children
-		NodeList nodes = topNode.getChildNodes();
-		int len = nodes.getLength();
-		for (int i = 0; i < len; i++) {
-			Node childNode = nodes.item(i);
-			printNode(childNode, out);
-		}
-
-	}
-
-	public DebugDocument() {
-		super();
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
deleted file mode 100644
index c2dcaba6b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
+++ /dev/null
@@ -1,1134 +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.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP;
-import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
-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.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.CoreNodeList;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * @author Nitin Dahyabhai <nitind@us.ibm.com>
- */
-public class ScannerUnitTests extends TestCase {
-
-	public static boolean checkComplexRegionTypes(ITextRegionList regions, String[] contexts, String[][] embeddedContexts) {
-
-		int embedCount = 0;
-		Iterator iterator = regions.iterator();
-		for (int i = 0; i < contexts.length; i++) {
-			if (!iterator.hasNext())
-				return false;
-			ITextRegion region = (ITextRegion) iterator.next();
-			assertEquals("context " + i + " incorrect", contexts[i], region.getType());
-			if (region instanceof ITextRegionContainer) {
-				ITextRegionContainer container = (ITextRegionContainer) region;
-				boolean embeddedResult = checkSimpleRegionCount(container, embeddedContexts[embedCount].length) && checkSimpleRegionTypes(container.getRegions(), embeddedContexts[embedCount]);
-				embedCount++;
-				assertTrue(embeddedResult);
-			}
-		}
-		return true;
-	}
-
-	public static boolean checkModelLength(IStructuredDocument document, int length) {
-		return checkModelLength(document.getLastStructuredDocumentRegion(), length);
-	}
-
-	public static boolean checkModelLength(IStructuredDocumentRegion region, int length) {
-		return region.getEndOffset() == length;
-	}
-
-	public static boolean checkSimpleRegionCount(ITextRegionContainer regionContainer, int size) {
-		// yes, this looks silly, but it makes it easier to find the exact
-		// failure point
-		assertEquals("region count", size, regionContainer.getNumberOfRegions());
-		return true;
-	}
-
-	public static boolean checkSimpleRegionCounts(IStructuredDocumentRegionList regionContainers, int[] sizes) {
-		int containers = regionContainers.getLength();
-		assertEquals("different number of containers", sizes.length, containers);
-		for (int i = 0; i < sizes.length; i++) {
-			assertEquals("container " + i + " is different", sizes[i], regionContainers.item(i).getNumberOfRegions());
-			continue;
-		}
-		return true;
-	}
-
-	public static boolean checkSimpleRegionTypes(ITextRegionList regions, String[] contexts) {
-		for (int i = 0; i < contexts.length; i++) {
-			ITextRegion region = regions.get(i);
-			assertEquals("region type " + i, contexts[i], region.getType());
-		}
-		return true;
-	}
-
-	public static String loadChars(InputStream input) {
-
-		StringBuffer s = new StringBuffer();
-		try {
-			int c = -1;
-			while ((c = input.read()) >= 0) {
-				if (c > 255)
-					break;
-				s.append((char) c);
-			}
-			input.close();
-		}
-		catch (IOException e) {
-			System.out.println("An I/O error occured while scanning :");
-			System.out.println(e);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return s.toString();
-	}
-
-	/**
-	 * Starts the application.
-	 * 
-	 * @param args
-	 *            an array of command-line arguments
-	 */
-	public static void main(java.lang.String[] args) {
-
-		if (args == null || args.length == 0) {
-			runAll();
-		}
-		else if (args.length == 1) {
-			String methodToRun = args[0].trim();
-			runOne(methodToRun);
-		}
-	}
-
-	protected static void runAll() {
-
-		junit.textui.TestRunner.run(suite());
-	}
-
-	protected static void runOne(String methodName) {
-
-		TestSuite testSuite = new TestSuite();
-		TestCase test = new ScannerUnitTests(methodName);
-		testSuite.addTest(test);
-		junit.textui.TestRunner.run(testSuite);
-	}
-
-	protected static Test suite() {
-
-		return new TestSuite(ScannerUnitTests.class);
-	}
-
-	public static void verifyLengths(int startOffset, IStructuredDocumentRegion firstDocumentRegion, String text) {
-		IStructuredDocumentRegion holdRegion = firstDocumentRegion;
-		assertTrue("document does not start at expected offset", holdRegion.getStartOffset() == startOffset);
-		int lastEnd = 0;
-		while (holdRegion != null && holdRegion.getEndOffset() > 0) {
-			assertTrue("zero-length StructuredDocumentRegion found", holdRegion.getStartOffset() == lastEnd);
-			assertTrue("TextRegionless StructuredDocumentRegion found", holdRegion.getNumberOfRegions() > 0);
-			ITextRegionList list = holdRegion.getRegions();
-			int index = 0;
-			for (int i = 0; i < list.size(); i++) {
-				ITextRegion region = list.get(i);
-				assertTrue("text region seams don't match", region.getStart() == index);
-				index += region.getLength();
-			}
-			lastEnd = holdRegion.getEndOffset();
-			holdRegion = holdRegion.getNext();
-		}
-
-		holdRegion = firstDocumentRegion;
-		while (holdRegion != null && holdRegion.getNext() != null) {
-			holdRegion = holdRegion.getNext();
-		}
-		checkModelLength(holdRegion, text.length());
-	}
-
-	public static void verifyLengths(int startOffset, IStructuredDocumentRegionList list, String text) {
-		verifyLengths(startOffset, list.item(0), text);
-	}
-
-	public static void verifyLengths(IStructuredDocument document, String text) {
-		verifyLengths(0, document.getFirstStructuredDocumentRegion(), text);
-	}
-
-	public static void verifyLengths(IStructuredModel model, String text) {
-		verifyLengths(model.getStructuredDocument(), text);
-	}
-
-	protected IStructuredDocument fModel;
-	protected String input;
-	private BlockTagParser parser;
-	protected Object type;
-
-	public ScannerUnitTests(String name) {
-
-		super(name);
-	}
-
-	protected void appendTagBlock(StringBuffer buffer, String tagname, int length) {
-
-		buffer.append('<');
-		buffer.append(tagname);
-		buffer.append('>');
-		for (int i = 0; i < length; i++)
-			buffer.append('_');
-		buffer.append("</");
-		buffer.append(tagname);
-		buffer.append('>');
-	}
-
-	protected void setUp() {
-
-		setUpXML(null);
-	}
-
-	protected IStructuredDocumentRegionList setUpJSP(String text) {
-
-		setupModel(new ModelHandlerForJSP());
-		parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
-
-		/*
-		 * IStructuredDocumentRegionList nodes = setUpJSP("content <script>
-		 * <%= expression %> </script> <a> </a> <foo:disallowJSP> <%= %>
-		 * </foo:disallowJSP> >"); parser.addBlockMarker(new
-		 * BlockMarker("jsp:declaration", null,
-		 * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
-		 * BlockMarker("jsp:expression", null,
-		 * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
-		 * BlockMarker("jsp:scriptlet", null,
-		 * XMLJSPRegionContexts.JSP_CONTENT, true));
-		 */
-		input = text;
-		fModel.set(input);
-		return fModel.getRegionList();
-	}
-
-	protected void setupModel(IModelHandler contentType) {
-
-		fModel = (IStructuredDocument) contentType.getDocumentLoader().createNewStructuredDocument();
-		this.parser = (BlockTagParser) fModel.getParser();
-	}
-
-	protected IStructuredDocumentRegionList setUpXML(String text) {
-
-		setupModel(new ModelHandlerForXML());
-		parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
-		input = text;
-		fModel.set(input);
-		return fModel.getRegionList();
-	}
-
-	protected void testBlockScanBufferBoundaries(String contentTypeID) {
-		IStructuredDocument document = null;
-		// the interesting offsets are around 16k (16384)
-		// for (int i = 16500; i > 16100; i--) {
-		// for (int i = 17000; i > 15000; i--) {
-		for (int i = 16384 + 25; i > 16364 - 25; i--) {
-			StringBuffer text = new StringBuffer();
-			document = StructuredModelManager.getModelManager().createStructuredDocumentFor(contentTypeID);
-			appendTagBlock(text, "script", i);
-			String string = text.toString();
-			try {
-				document.setText(this, string);
-				verifyLengths(document, string);
-				assertTrue("too few document regions [run value " + i + "] ", new CoreNodeList(document.getFirstStructuredDocumentRegion()).getLength() == 3);
-				verifyLengths(document, string);
-				IStructuredDocumentRegion startTag = document.getFirstStructuredDocumentRegion();
-				IStructuredDocumentRegion middleBlock = startTag.getNext();
-				// IStructuredDocumentRegion endTag = middleBlock.getNext();
-				assertTrue("not block text in middle", middleBlock.getFirstRegion().getType() == DOMRegionContext.BLOCK_TEXT);
-			}
-			catch (Exception e) {
-				assertNull("exception caught" + e, e);
-			}
-			// System.gc();
-		}
-	}
-
-	public void testBlockScanBufferBoundariesForHTML() {
-		testBlockScanBufferBoundaries("org.eclipse.wst.html.core.htmlsource");
-	}
-
-	public void testBlockScanBufferBoundariesForJSP() {
-		testBlockScanBufferBoundaries("org.eclipse.jst.jsp.core.jspsource");
-	}
-
-	private void testBlockTag(IStructuredDocumentRegionList nodes) {
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testBlockTag_JSP() {
-		testBlockTag(setUpJSP("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
-	}
-
-	/**
-	 * Check block tag scanning between XML content
-	 */
-	public void testBlockTag_XML() {
-
-		testBlockTag(setUpXML("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
-	}
-
-	/**
-	 * Check block tag scanning between XML content
-	 */
-	public void testBlockTagWithJSPExpressions() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("begin <script type=\"pl2\"> <%= \"expression\"%> </scrIPt> <a></a> <disallowJSP> <%= \"expression\" %> </disallowJSP> end");
-
-		// OLD
-		// boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6,
-		// 3, 3, 1, 3, 3, 1, 3, 3, 3, 1});
-		// NEW
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 3, 3, 1, 3, 3, 1, 3, 1, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		int i = 0;
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkComplexRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE}}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					// CORRECT BEHAVIOR
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT})
-					// OLD, BROKEN BEHAVIOR
-					// && checkSimpleRegionTypes(nodes.item(i++).getRegions(),
-					// new
-					// String[]{
-					// XMLRegionContext.BLOCK_TEXT,
-					// XMLRegionContext.BLOCK_TEXT,
-					// XMLRegionContext.BLOCK_TEXT})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	private void testBufferUnderRun_1(IStructuredDocumentRegionList nodes) {
-
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 2});
-		assertTrue("IStructuredDocumentRegion region count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testBufferUnderRun_1_JSP() {
-		testBufferUnderRun_1(setUpJSP("content <tag a=b/><!--c"));
-	}
-
-	/**
-	 * Check for buffer under-runs on block scanning
-	 */
-	public void testBufferUnderRun_1_XML() {
-		testBufferUnderRun_1(setUpXML("content <tag a=b/><!--c"));
-	}
-
-	private void testBufferUnderRun_2(IStructuredDocumentRegionList nodes) {
-
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1});
-		assertTrue("IStructuredDocumentRegion region count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testBufferUnderRun_2_JSP() {
-
-		testBufferUnderRun_2(setUpJSP("content <tag a=b/><!--"));
-	}
-
-	/**
-	 * Check for buffer under-runs on block scanning
-	 */
-	public void testBufferUnderRun_2_XML() {
-
-		testBufferUnderRun_2(setUpXML("content <tag a=b/><!--"));
-	}
-
-	private void testCDATA(IStructuredDocumentRegionList nodes) {
-
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testCDATA_JSP() {
-
-		testCDATA(setUpJSP("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
-	}
-
-	/**
-	 * Check CDATA section scanning between content
-	 */
-	public void testCDATA_XML() {
-
-		testCDATA(setUpXML("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
-	}
-
-	public void testCDATAinBlockJSP1() {
-		setUpJSP("<script><![CDATA[ contents]]></script>");
-	}
-
-	public void testCDATAinBlockJSP2() {
-		setUpJSP("<script><![CDATA[</script>]]></script>");
-	}
-
-	public void testCDATAinBlockJSP2a() {
-		setUpJSP("<script><![CDATA[contents</script>]]></script>");
-	}
-
-	public void testCDATAinBlockJSP2b() {
-		setUpJSP("<script><![CDATA[</script>contents]]></script>");
-	}
-
-	public void testCDATAinBlockJSP3() {
-		setUpJSP("<script><![CDATA[]]></script>");
-	}
-
-	public void testCDATAinBlockJSP4() {
-		setUpJSP("<script><![CDATA[ ]]>");
-	}
-
-	public void testCDATAinBlockJSP5() {
-		setUpJSP("<script><![CDATA[ ]]]>");
-	}
-
-	public void testCDATAinBlockJSP6() {
-		setUpJSP("<script><![CDATA[ ]]");
-	}
-
-	public void testCDATAinBlockJSP7() {
-		setUpJSP("<script><![CDATA[ ");
-	}
-
-	public void testCDATAinBlockJSP8() {
-		setUpJSP("<script><![CDATA[");
-	}
-
-	public void testCDATAinBlockXML1() {
-		setUpXML("<script><![CDATA[ ]]></script>");
-	}
-
-	public void testCDATAinBlockXML2() {
-		setUpXML("<script><![CDATA[</script>]]></script>");
-	}
-
-	public void testCDATAinBlockXML3() {
-		setUpXML("<script><![CDATA[]]></script>");
-	}
-
-	public void testCDATAinBlockXML4() {
-		setUpXML("<script><![CDATA[ ]]>");
-	}
-
-	public void testCDATAinBlockXML5() {
-		setUpXML("<script><![CDATA[ ]]]>");
-	}
-
-	public void testCDATAinBlockXML6() {
-		setUpXML("<script><![CDATA[ ]]");
-	}
-
-	public void testCDATAinBlockXML7() {
-		setUpXML("<script><![CDATA[ ");
-	}
-
-	public void testCDATAinBlockXML8() {
-		setUpXML("<script><![CDATA[");
-	}
-
-	/**
-	 * Check comments between XML content
-	 */
-	public void testComments_JSP() {
-		String text = "a <!-- --><!----><%-- --%> b";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 2, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check comments between JSP content
-	 */
-	public void testComments_XML() {
-		String text = "a <!-- --><<!---->b";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 2, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	private void testContent(IStructuredDocumentRegionList nodes) {
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	/**
-	 * Check simple content scanning
-	 */
-	public void testContentJSP() {
-
-		testContent(setUpJSP("hello world"));
-	}
-
-	public void testContentXML() {
-
-		testContent(setUpXML("hello world"));
-	}
-	
-	public void testDirectiveInTagBody() {
-		String text = "<BODY <%@ include file=\"commonEventHandlers.jspf\" %> dir=\"ltr\"> ";
-		IStructuredDocumentRegionList documentRegionList = setUpJSP(text);
-		verifyLengths(0, documentRegionList, text);
-
-		checkSimpleRegionTypes(documentRegionList.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE});
-		ITextRegionCollection coll = (ITextRegionCollection) documentRegionList.item(0).getRegions().get(2);
-		checkSimpleRegionTypes(coll.getRegions(), new String[]{DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN, DOMRegionContext.WHITE_SPACE, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.WHITE_SPACE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.WHITE_SPACE, DOMJSPRegionContexts.JSP_DIRECTIVE_CLOSE});
-	}
-
-	public void testDollarsign_Leading() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$ \"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testDollarsign_Single() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testDollarsign_SingleWithSpaces() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\" $ \"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testELinContent() {
-		String text = "${out.foo}";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-
-	public void testELtolerance_transparency_Dquote() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"${out.foo}\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testELtolerance_transparency_DquoteWithSpaces() {
-		// note: whitespace on either side returns a WHITE_SPACE context
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"_${out.foo}_\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testELtolerance_transparency_Squote() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type='${out.foo}'/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPDeclaration() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%! int foo; %>\" baz=\"il\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPDeclarationInCDATA() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%!%>]]>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPExpression() {
-		IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%= \"Hello, World\"%>\" baz=\"il\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPExpressionInCDATA() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%=%>]]>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPScriptlet() {
-		IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%  %>\" baz=\"il\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPScriptletInCDATA() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%%>]]>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedTagInAttr() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("<a href=\"<jsp:getProperty/>\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSP_DHTMLimport() {
-		String text = "<a> <?import type=\"foo\">";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testJSP_PI() {
-		String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPAmpersandInTagNameInAttValue() {
-		String text = "<a href=\"<a&b>\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{7, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (broken embedded tag)", sizeCheck);
-
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.UNDEFINED});
-		assertTrue("region context type check (broken embedded tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check (content)", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testJSPCommentInXMLComment() {
-		String text = "s<!--\n<%--c--%>\n-->\n<html>\n<body><script> <%--c--%> </script>\n";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 5, 1, 3, 1, 3, 3, 3, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		int item = 0;
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT,
-								DOMRegionContext.XML_COMMENT_CLOSE}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN,
-								DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPCommentAtStartOfXMLCommentAndBlockTag() {
-		String text = "s<!--<%--c--%>\n-->\n<html>\n<body><script><%--c--%> </script>\n";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1, 3, 1, 3, 3, 2, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		int item = 0;
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		typeCheck = typeCheck && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		typeCheck = typeCheck && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPCommentinXMLTag() {
-		String text = "s<a <%--c--%> b=c/>\n";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 7, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		int item = 0;
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		typeCheck = typeCheck && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE},new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE, DOMRegionContext.WHITE_SPACE}});
-		typeCheck = typeCheck && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check that jsp:directive.(include|page|taglib) are recognized and
-	 * treated properly
-	 */
-	public void testJSPDirectiveTags() {
-		String text = "begin <jsp:directive.taglib> <jsp:directive.page a> <jsp:directive.include a=> <jsp:directive.pages a=b> end";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPDollarsign_Trailing() {
-		String text = "<a type=\" $\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPDollarsign_TrailingInContent() {
-		String text = "nnn$<a type=\" $\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check (content)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check (content)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check JSP code sections between HTML content
-	 */
-	public void testJSPExpression() {
-		IStructuredDocumentRegionList nodes = setUpJSP("begin <%= \"Hello,World\" %> end");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 1, 1, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSPGreaterThanInAttValue() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\">next\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		assertTrue("region is not somple", !(nodes.item(0).getRegions().get(4) instanceof ITextRegionContainer));
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSPInvalidTagNameInAttValue() {
-		String text = "S<a type=\"a<4\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(1).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(1).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check (att value)", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPLessThanInAttValue() {
-		// bails out of the attribute value with an UNDEFINED region for the
-		// end quote
-		String text = "<button label=\"<previous\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.UNDEFINED});
-		assertTrue("region context type check (att value)", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check JSP code sections, as a tag, scanning between HTML content
-	 */
-	// public void testJSPScriptletTag() {
-	// IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:scriptlet>
-	// int foo = bar; //<jsp:Scriptlet>//</jsp:scriptlets</jsp:scriptlet>
-	// end");
-	//	
-	// boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
-	// 3,
-	// 1});
-	// assertTrue("IStructuredDocumentRegion and ITextRegion count",
-	// sizeCheck);
-	//
-	// boolean typeCheck =
-	// checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
-	// XMLRegionContext.XML_CONTENT})
-	// && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
-	// XMLRegionContext.XML_TAG_OPEN,
-	// XMLRegionContext.XML_TAG_NAME,
-	// XMLRegionContext.XML_TAG_CLOSE})
-	// && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
-	// XMLJSPRegionContexts.JSP_CONTENT})
-	// && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
-	// XMLRegionContext.XML_END_TAG_OPEN,
-	// XMLRegionContext.XML_TAG_NAME,
-	// XMLRegionContext.XML_TAG_CLOSE})
-	// && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_CONTENT});
-	// assertTrue("region context type check", typeCheck);
-	//		
-	// verifyModelLength();
-	// }
-	/**
-	 * Check JSP code sections, as a tag, scanning between HTML content
-	 */
-	// public void testJSPTextTag() {
-	// IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:text> int
-	// foo
-	// = bar; //<jsp:TEXT>//</jsp:Texts</jsp:text> <a> </a> end");
-	//	
-	// boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
-	// 3,
-	// 1, 3, 1, 3, 1});
-	// assertTrue("IStructuredDocumentRegion and ITextRegion count",
-	// sizeCheck);
-	//
-	// boolean typeCheck =
-	// checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_CONTENT})
-	// && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_TAG_OPEN,
-	// XMLJSPRegionContexts.XML_TAG_NAME,
-	// XMLJSPRegionContexts.XML_TAG_CLOSE})
-	// && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_CDATA_TEXT})
-	// && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_END_TAG_OPEN,
-	// XMLJSPRegionContexts.XML_TAG_NAME,
-	// XMLJSPRegionContexts.XML_TAG_CLOSE})
-	// && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_CONTENT})
-	// && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_TAG_OPEN,
-	// XMLJSPRegionContexts.XML_TAG_NAME,
-	// XMLJSPRegionContexts.XML_TAG_CLOSE})
-	// && checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_CONTENT})
-	// && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_END_TAG_OPEN,
-	// XMLJSPRegionContexts.XML_TAG_NAME,
-	// XMLJSPRegionContexts.XML_TAG_CLOSE})
-	// && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{
-	// XMLJSPRegionContexts.XML_CONTENT});
-	// assertTrue("region context type check", typeCheck);
-	//		
-	// verifyModelLength();
-	// }
-	/**
-	 * Check that jsp:root is recognized and treated properly
-	 */
-	public void testJSPRootTag() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:root> <jsp:roots a> <jsp:roo a=> </jsp:root a=b><a>end");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSPTagInAttValue() {
-		String text = "<a type=\"<a/>\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check (att value)", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testNothinginBlockJSP9() {
-		String text = "<script>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testNothinginBlockXML9() {
-		String text = "<script>";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	private void testSimpleTag(IStructuredDocumentRegionList nodes) {
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 10, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testSimpleTag_JSP() {
-		testSimpleTag(setUpJSP("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
-	}
-
-	/**
-	 * Check simple tag scanning between XML content
-	 */
-	public void testSimpleTag_XML() {
-		testSimpleTag(setUpXML("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
-	}
-
-	public void testVBLinContent() {
-		String text = "#{out.foo}";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testVBLtolerance_transparency_Dquote() {
-		String text = "<a type=\"#{out.foo}\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testVBLtolerance_transparency_DquoteWithSpaces() {
-		// note: whitespace on either side returns a WHITE_SPACE context
-		String text = "<a type=\"_#{out.foo}_\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testVBLtolerance_transparency_Squote() {
-		String text = "<a type='#{out.foo}'/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testXML_DHTMLimport() {
-		String text = "<a> <?import type=\"foo\">";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testXML_PI() {
-		String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testXMLDollarsign_Trailing() {
-		String text = "<a type=\" $\"/>";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testUndefinedRegionContainer() {
-		// see RATLC RATLC00284776
-		String text = "<option <elms:inputValue value=\"<%=uomvox.uomID%>\"/><%=uomvox.uomID.equals(uomID) ? \" selected\" : \"\"%>>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{5});
-		assertTrue("IStructuredDocumentRegion and overall ITextRegion count", sizeCheck);
-		// checkComplexRegionTypes(nodes.item(0).getRegions(), new
-		// String[]{XMLRegionContext.XML_TAG_OPEN,
-		// XMLRegionContext.XML_TAG_NAME,
-		// XMLRegionContext.XML_TAG_ATTRIBUTE_NAME,
-		// XMLRegionContext.UNDEFINED, XMLRegionContext.XML_TAG_CLOSE}, new
-		// String[][] {{}});
-		verifyEmbeddedContainerParentage(nodes);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * @param nodes
-	 */
-	private void verifyEmbeddedContainerParentage(IStructuredDocumentRegionList nodes) {
-		for (int i = 0; i < nodes.getLength(); i++) {
-			IStructuredDocumentRegion r = nodes.item(i);
-			ITextRegionList list = r.getRegions();
-			for (int j = 0; j < list.size(); j++) {
-				ITextRegion region = list.get(j);
-				if (region instanceof ITextRegionContainer) {
-					assertNotNull("parent is null for " + region, ((ITextRegionContainer) region).getParent());
-				}
-			}
-		}
-	}
-
-	protected boolean verifyModelLength() {
-		return checkModelLength(fModel, input.length());
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
deleted file mode 100644
index 373d95f9c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
+++ /dev/null
@@ -1,286 +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.ui.tests.other;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-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.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentRegionIterator;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * test class for basic parsing and scanning
- */
-
-public class ScanningTests {
-	private static IStructuredDocument textStore = null;
-	private static long startTime = 0;
-	private static long stopTime = 0;
-
-	/**
-	 * ScanningTests constructor comment.
-	 */
-	public ScanningTests() {
-		super();
-	}
-
-	public static void checkNodeSeams(String fileName) {
-		System.out.println("CHECKING NODE BOUNDARIES AND CONTENTS FOR " + fileName);
-		Enumeration e = parseFile(fileName).elements();
-		int lastEnd = 0;
-		while (e.hasMoreElements()) {
-			IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.nextElement();
-			if (r.getStartOffset() != lastEnd)
-				System.out.println("ERROR: dropped in " + r);
-			if (r.getNumberOfRegions() < 1)
-				System.out.println("ERROR: empty IStructuredDocumentRegion " + r);
-			lastEnd = r.getEndOffset();
-		}
-		System.out.println("DONE");
-	}
-
-	public static void checkParse(String fileName) {
-		checkTokenSeams(fileName);
-		checkNodeSeams(fileName);
-	}
-
-	public static void checkTokenSeams(String fileName) {
-		System.out.println("CHECKING TOKENIZER REGION BOUNDARIES FOR " + fileName);
-		Iterator e = tokenizeFile(fileName).iterator();
-		int lastEnd = 0;
-		while (e.hasNext()) {
-			IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.next();
-			if (r.getStartOffset() != lastEnd)
-				System.out.println("ERROR: dropped in " + r);
-			lastEnd = r.getEndOffset();
-		}
-		System.out.println("DONE");
-	}
-
-	public static char[] loadChars(String fileName) {
-		char[] chars = null;
-		int c = 0;
-		int length = 0;
-		int count = 0;
-		File file = null;
-		FileInputStream fis = null;
-		try {
-			file = new File(fileName);
-			length = (int) file.length();
-			chars = new char[length];
-			fis = new FileInputStream(file);
-			while (((c = fis.read()) >= 0) && (count < length)) {
-				chars[count++] = (char) c;
-			}
-		}
-		catch (FileNotFoundException e) {
-			System.out.println("File not found : \"" + fileName + "\"");
-			System.exit(1);
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			System.out.println("Usage : java JSPLexer3 <inputfile>");
-			System.exit(1);
-		}
-		catch (IOException e) {
-			System.out.println("An I/O error occured while scanning :");
-			System.out.println(e);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return chars;
-	}
-
-	public static RegionParser newParser() {
-		JSPSourceParser parser = new JSPSourceParser();
-		parser.addBlockMarker(new BlockMarker("foo", null, DOMRegionContext.BLOCK_TEXT, true));
-		parser.addBlockMarker(new BlockMarker("globalFoo", null, DOMRegionContext.BLOCK_TEXT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:expression", null, XMLJSPRegionContexts.JSP_CONTENT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:scriptlet", null, XMLJSPRegionContexts.JSP_CONTENT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:declaration", null, XMLJSPRegionContexts.JSP_CONTENT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:text", null, XMLRegionContext.XML_CDATA_TEXT, true));
-		return parser;
-	}
-
-	public static RegionParser newXMLParser() {
-		XMLSourceParser parser = new XMLSourceParser();
-		parser.addBlockMarker(new BlockMarker("Script", DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("stylE", DOMRegionContext.BLOCK_TEXT, false));
-		return parser;
-	}
-
-	public static Vector parse(String stringdata) {
-		return parse(stringdata, false);
-	}
-
-	public static Vector parse(String stringdata, boolean useXML) {
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		RegionParser parser = null;
-		if (useXML)
-			parser = newXMLParser();
-		else
-			parser = newParser();
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) creating a " + parser.getClass().getName());
-		}
-		// Caution: cast
-		parser.reset(new StringReader(stringdata));
-		IStructuredDocumentRegion aNode = setNodeDocument(parser.getDocumentRegions());
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
-		textStore.setText(null, stringdata);
-		StructuredDocumentRegionIterator.setParentDocument(aNode, textStore);
-		Vector v = new Vector();
-		while (aNode != null) {
-			v.addElement(aNode);
-			aNode = aNode.getNext();
-		}
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) setting text and storing nodes");
-		}
-		return v;
-	}
-
-	public static Vector parseFile(String fileName) {
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		char[] input = loadChars(fileName);
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
-		}
-		return parse(new String(input));
-	}
-
-	private static IStructuredDocumentRegion setNodeDocument(IStructuredDocumentRegion startNode) {
-		// Caution: cast
-		IStructuredDocumentRegion aNode = startNode;
-		while (aNode != null) {
-			aNode.setParentDocument(textStore);
-			aNode = aNode.getNext();
-		}
-		return startNode;
-	}
-
-	public static List tokenizeFile(String fileName) {
-		List v = null;
-		StringBuffer buff = new StringBuffer();
-		try {
-			//char[] input = loadChars(fileName);
-			Reader input = new FileReader(fileName);
-			RegionParser parser = newParser();
-			// parser must be given input, before tokenizer is valid
-			parser.reset(input);
-			int c = 0;
-			parser.getDocumentRegions();
-			v = parser.getRegions();
-			input.reset();
-			while ((c = input.read()) >= 0) {
-				buff.append((char) c);
-			}
-			textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
-			textStore.setText(null, buff.toString());
-		}
-		catch (FileNotFoundException e) {
-			System.out.println("File not found : \"" + fileName + "\"");
-		}
-		catch (IOException e) {
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			System.out.println("Usage : java JSPLexer3 <inputfile>");
-		}
-		return v;
-	}
-
-	public static String viewableTokenizeWithSeparator(String data) {
-		StringBuffer s = new StringBuffer();
-		s.append("\"");
-		s.append(data);
-		s.append("\"\n");
-		s.append(viewableTokenize(data));
-		s.append("--------------------------------------------------------------------------------\n");
-		return s.toString();
-	}
-
-	public static String viewableTokenize(String stringdata) {
-		return viewableTokenize(stringdata, false);
-	}
-
-	public static String viewableTokenize(String stringdata, boolean useXML) {
-		java.util.List l = parse(stringdata, useXML);
-		String s = "";
-		for (int i = 0; i < l.size(); i++) {
-			IStructuredDocumentRegion node = (IStructuredDocumentRegion) l.get(i);
-			try {
-				s += StringUtils.escape(node.toString()) + "\n";
-			}
-			catch (Exception e) {
-				s += "[" + node.getStart() + ", " + node.getEnd() + "] (UNPRINTABLE " + e + ")";
-			}
-			ITextRegionList m = node.getRegions();
-			for (int j = 0; j < m.size(); j++)
-				if (m.get(j) instanceof ITextRegionContainer) {
-					s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
-					ITextRegionList n = ((ITextRegionContainer) m.get(j)).getRegions();
-					for (int k = 0; k < n.size(); k++)
-						s = s + "\t\t" + StringUtils.escape(n.get(k).toString()) + "\n";
-				}
-				else
-					s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
-		}
-		return s;
-	}
-
-	public static String viewableTokenizeFile(String fileName) {
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		char[] input = loadChars(fileName);
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
-		}
-		return viewableTokenize(new String(input));
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
deleted file mode 100644
index d6d59ce72..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
+++ /dev/null
@@ -1,360 +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.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class StructuredDocumentToDOMUnitTests implements IStructuredDocumentListener {
-	public StructuredDocumentToDOMUnitTests() {
-		super();
-	}
-
-	String getTestString1() {
-		return "<a>a<b />b</a>"; // -> <a>ab</a>;
-	}
-
-	String getTestString2() {
-		return "<menu>\n<rname>\nLiam's Chowder House and Grill\n</rname>\n</menu>";
-	}
-
-	String getTestString3() {
-		// return " <?xml version=\"1.0\" ?>\n
-		// <testTopSibling><p>text</p></testTopSibling>";
-		return "<test/>\n\n <html>\n</html>";
-	}
-
-	String getTestString4() {
-		return "<?xml version=\"1.0\" ?>";
-	}
-
-	/**
-	 * 
-	 * @param args
-	 *            java.lang.String[]
-	 */
-	public static void main(String[] args) {
-
-		try {
-			StructuredDocumentToDOMUnitTests instance = new StructuredDocumentToDOMUnitTests();
-			instance.testNodeDeletion4();
-		}
-		catch (Exception t) {
-			t.printStackTrace();
-		}
-	}
-
-	void makeChange1(IDOMModel tree) {
-
-		//	
-		// pick a parent and ones of its children to delete
-		// (note: validity of this code is highly dependent on input string)
-		org.w3c.dom.Document dom = tree.getDocument();
-		NodeList nodes = dom.getChildNodes();
-		//
-		/*
-		 * for "first" test case Node testParentNode = nodes.item(0); Node
-		 * testChildNode = testParentNode.getFirstChild();
-		 */
-		// for "second" test case
-		Node testParentNode = nodes.item(0);
-		Node testChildNode = testParentNode.getFirstChild();
-		testChildNode = testChildNode.getNextSibling();
-
-		testParentNode.removeChild(testChildNode);
-
-	}
-
-	void makeChange2(IStructuredDocument structuredDocument) {
-
-		// delete the apostrope in test string // 4, 4?
-		structuredDocument.replaceText(this, 19, 1, null);
-	}
-
-	void makeChange3(IDOMModel tree) {
-
-		//	
-		// pick a parent and ones of its children to delete
-		// (note: validity of this code is highly dependent on input string)
-		org.w3c.dom.Document dom = tree.getDocument();
-		// NodeList nodes = dom.getChildNodes();
-		//
-		Node testChildNode = dom.getLastChild();
-
-		dom.removeChild(testChildNode);
-
-	}
-
-	/**
-	 * newModel method comment.
-	 */
-	public void newModel(NewDocumentEvent structuredDocumentEvent) {
-		System.out.println("newModel:");
-	}
-
-	/**
-	 * noChange method comment.
-	 */
-	public void noChange(NoChangeEvent structuredDocumentEvent) {
-		// log for now, unless we find reason not to
-		Logger.log(Logger.INFO, "StructuredDocumentToDOMUnitTests::noChange needs to be implemented");
-	}
-
-	/**
-	 * nodesReplaced method comment.
-	 */
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
-		System.out.println("nodesReplaced:");
-		System.out.println("\tNewFlatNodes:");
-		IStructuredDocumentRegionList flatNodeList = structuredDocumentEvent.getNewStructuredDocumentRegions();
-		int len = flatNodeList.getLength();
-		for (int i = 0; i < len; i++) {
-			String outString = flatNodeList.item(i).toString();
-			outString = StringUtils.escape(outString);
-			System.out.println("\t\t" + outString);
-		}
-		System.out.println("\tOldFlatNodes:");
-		flatNodeList = structuredDocumentEvent.getOldStructuredDocumentRegions();
-		len = flatNodeList.getLength();
-		for (int i = 0; i < len; i++) {
-			String outString = flatNodeList.item(i).toString();
-			outString = StringUtils.escape(outString);
-			System.out.println("\t\t" + outString);
-		}
-	}
-
-	/**
-	 * regionChanged method comment.
-	 */
-	public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
-		System.out.println("regionChanged:");
-	}
-
-	/**
-	 * regionsReplaced method comment.
-	 */
-	public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
-		System.out.println("regionsReplaced:");
-	}
-
-	/**
-	 * Unit test -- tests basic parsing results of inserting a test string
-	 * into an initial string.
-	 */
-	void testNodeDeletion() {
-		// String initialString =
-		// "<par><x>\ntextx\n</x>\n<y>\ntexty\n</y></par>";
-		// String initialString = "<par><x>textx</x><y>texty</y></par>";
-		// test cases for two text nodes left together (remove <b/>):
-		// first case works, second doesn't
-		// String initialString = "<a>a<b /></a>"; // -> <a>a</a>
-		// String initialString = "<a>a<b />b</a>"; // -> <a>ab</a>
-		// String initialString = getTestString1();
-		String initialString = getTestString2();
-
-		// print out what we always can
-		System.out.println();
-		System.out.println("----------------");
-		System.out.println("Test Node Deletion");
-		String outString = StringUtils.escape(initialString);
-		System.out.println("Initial String: " + outString);
-		// always start with fresh model
-		IStructuredDocument f = null;
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-
-
-		//
-		// we'll listen to structuredDocument events to print out diagnostics
-		f.addDocumentChangedListener(this);
-		//
-
-		IDOMModel tree = new DOMModelImpl();
-		f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
-		// set text to structuredDocument (which updates tree)
-		f.setText(null, initialString);
-
-		// dump initial structuredDocument
-		Debug.dump(f);
-		// dump initial dom
-		DebugDocument.dump(tree.getDocument());
-		//
-		//
-		// makeChange1(tree);
-		makeChange2(f);
-
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-	}
-
-	/**
-	 * Unit test -- tests basic parsing results of inserting a test string
-	 * into an initial string.
-	 */
-	void testNodeDeletion3() {
-		String initialString = getTestString3();
-
-		// print out what we always can
-		System.out.println();
-		System.out.println("----------------");
-		System.out.println("Test Node Deletion");
-		String outString = StringUtils.escape(initialString);
-		System.out.println("Initial String: " + outString);
-		// always start with fresh model
-		IStructuredDocument f = null;
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		//
-		// we'll listen to structuredDocument events to print out diagnostics
-		f.addDocumentChangedListener(this);
-		//
-
-		IDOMModel tree = new DOMModelImpl();
-		f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
-		// set text to structuredDocument (which updates tree)
-		f.setText(null, initialString);
-
-		// dump initial structuredDocument
-		Debug.dump(f);
-		// dump initial dom
-		DebugDocument.dump(tree.getDocument());
-		//
-		//
-		// makeChange1(tree);
-		makeChange3(tree);
-
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-	}
-
-	/**
-	 * Unit test -- test insert followed by delete at beginning of string.
-	 */
-	void testNodeDeletion4() {
-		String initialString = getTestString4();
-
-		// print out what we always can
-		System.out.println();
-		System.out.println("----------------");
-		System.out.println("Test Node Insert and Delete");
-		String outString = StringUtils.escape(initialString);
-		System.out.println("Initial String: " + outString);
-		// always start with fresh model
-		IStructuredDocument f = null;
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		//
-		// we'll listen to structuredDocument events to print out diagnostics
-		f.addDocumentChangedListener(this);
-		//
-
-		IDOMModel tree = new DOMModelImpl();
-		f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
-		// set text to structuredDocument (which updates tree)
-		f.setText(null, initialString);
-
-		// dump initial structuredDocument
-		Debug.dump(f);
-		// dump initial dom
-		DebugDocument.dump(tree.getDocument());
-		//
-		//
-		f.replaceText(null, 0, 0, "a");
-
-		System.out.println(" ==== Results after insert");
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-		f.replaceText(null, 0, 1, "");
-
-		System.out.println(" ==== Results after delete");
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
deleted file mode 100644
index 3aed2165a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
+++ /dev/null
@@ -1,951 +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.ui.tests.other;
-
-/**
- * Use this test class to validate an implementation of the StyledTextContent
- * interface. To perform the validation, copy this class to the package where
- * your StyledTextContent implementation lives. Then specify the fully
- * qualified name of your StyledTextContent class as an argument to the main
- * method of this class.
- * 
- * NOTE: This test class assumes that your StyledTextContent implementation
- * handles the following delimiters:
- *  /r /n /r/n
- *  
- */
-// This class comes courtesy of Lynne Kues. Our StyledTextContent fails test
-// cases 6x of
-// "Special cases" since we (nor JFace) handle insertion between CR and LF. A
-// minor modification
-// was needed to getContentInstance for out version of StyleTextContent
-// (StructuredDocumentToTextAdapter).
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.custom.StyledTextContent;
-import org.eclipse.swt.custom.TextChangeListener;
-import org.eclipse.swt.custom.TextChangedEvent;
-import org.eclipse.swt.custom.TextChangingEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.StructuredDocumentToTextAdapter;
-
-public class StyledTextContentSpec implements TextChangeListener {
-	static String contentClassName;
-	static int failCount = 0;
-	static int errorCount = 0;
-	Class contentClass = null;
-	StyledTextContent contentInstance = null;
-	int verify = 0;
-	Method currentMethod = null;
-	boolean failed = false;
-	StyledText widget = null;
-	Shell shell = null;
-
-	public StyledTextContentSpec() {
-	}
-
-	public void assertWithMessage(String message, boolean condition) {
-		System.out.print("\t" + currentMethod.getName() + " " + message);
-		if (!condition)
-			fail(message);
-		else
-			System.out.println(" passed");
-	}
-
-	public void fail(String message) {
-		failed = true;
-		System.out.println(" FAILED");
-		failCount++;
-	}
-
-	public StyledTextContent getContentInstance() {
-		contentInstance.setText("");
-		widget.setContent(contentInstance);
-		// dw. Had to add for our special version of StyledTextContent
-		// Needs to be removed for testing jface's DocumentAdapter
-		((StructuredDocumentToTextAdapter) contentInstance).setWidget(widget);
-		return contentInstance;
-	}
-
-	public static String getTestText() {
-		return "This is the first line.\r\n" + "This is the second line.\r\n" + "This is the third line.\r\n" + "This is the fourth line.\r\n" + "This is the fifth line.\r\n" + "\r\n" + "This is the first line again.\r\n" + "This is the second line again.\r\n" + "This is the third line again.\r\n" + "This is the fourth line again.\r\n" + "This is the fifth line again.\r\n" + "\r\n" + "This is the first line once again.\r\n" + "This is the second line once again.\r\n" + "This is the third line once again.\r\n" + "This is the fourth line once again.\r\n" + "This is the fifth line once again.";
-	}
-
-	public static void main(String[] args) {
-		StyledTextContentSpec spec = new StyledTextContentSpec();
-		if (args.length > 0) {
-			contentClassName = args[0];
-			//String path = System.getProperty("java.library.path");
-			//System.out.println("Java Library Path: " + path);
-		}
-		else {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		spec.run();
-		System.out.println();
-		System.out.println(failCount + " TEST FAILURES.");
-		System.out.println(errorCount + " UNEXPECTED ERRORS.");
-	}
-
-	static private Display getDisplay() {
-		return PlatformUI.getWorkbench().getDisplay();
-	}
-
-	public void run() {
-		if (contentClassName.equals("")) {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		if (contentClass == null) {
-			try {
-				contentClass = Class.forName(contentClassName);
-			}
-			catch (ClassNotFoundException e) {
-				MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-				box.setMessage("Content class:\n" + contentClassName + "\nnot found"); //$NON-NLS-1$
-				box.open();
-				return;
-			}
-		}
-		try {
-			contentInstance = (StyledTextContent) contentClass.newInstance();
-		}
-		catch (IllegalAccessException e) {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Unable to access content class:\n" + contentClassName); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		catch (InstantiationException e) {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Unable to instantiate content class:\n" + contentClassName); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		Class clazz;
-		clazz = this.getClass();
-		Method[] methods = clazz.getDeclaredMethods();
-		for (int i = 0; i < methods.length; i++) {
-			setUp();
-			currentMethod = methods[i];
-			failed = false;
-			try {
-				if (currentMethod.getName().startsWith("test_")) {
-					System.out.println();
-					System.out.println(currentMethod.getName() + "...");
-					currentMethod.invoke(this, new Object[0]);
-					if (!failed) {
-						System.out.println("PASSED.");
-					}
-					else {
-						System.out.println("FAILED");
-					}
-				}
-			}
-			catch (InvocationTargetException ex) {
-				System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.getTargetException().toString());
-				System.out.println("FAILED");
-				errorCount++;
-			}
-			catch (Exception ex) {
-				System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.toString());
-				System.out.println("FAILED");
-				errorCount++;
-			}
-			if (verify != 0) {
-				verify = 0;
-				contentInstance.removeTextChangeListener(this);
-			}
-			tearDown();
-		}
-	}
-
-	protected void setUp() {
-		// create shell
-		shell = new Shell();
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		shell.setSize(500, 300);
-		shell.setLayout(layout);
-		// create widget
-		widget = new StyledText(shell, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		GridData spec = new GridData();
-		spec.horizontalAlignment = GridData.FILL;
-		spec.grabExcessHorizontalSpace = true;
-		spec.verticalAlignment = GridData.FILL;
-		spec.grabExcessVerticalSpace = true;
-		widget.setLayoutData(spec);
-		shell.open();
-	}
-
-	protected void tearDown() {
-		if (shell != null && !shell.isDisposed())
-			shell.dispose();
-		shell = null;
-	}
-
-	public void test_Delete() {
-		StyledTextContent content = getContentInstance();
-		String newText;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(6, 2, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":1a:", newText.equals("This\nia test\r"));
-		assertWithMessage(":1b:", content.getLine(0).equals("This"));
-		assertWithMessage(":1c:", content.getLine(1).equals("ia test"));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 9, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("This\n\r"));
-		assertWithMessage(":2b:", content.getLineCount() == 3);
-		assertWithMessage(":2c:", content.getLine(0).equals("This"));
-		assertWithMessage(":2d:", content.getLine(1).equals(""));
-		assertWithMessage(":2e:", content.getLine(2).equals(""));
-		content.setText("This\nis a test\nline 3\nline 4");
-		content.replaceTextRange(21, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("This\nis a test\nline 3"));
-		assertWithMessage(":3b:", content.getLineCount() == 3);
-		assertWithMessage(":3c:", content.getLine(0).equals("This"));
-		assertWithMessage(":3d:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":3e:", content.getLine(2).equals("line 3"));
-		content.setText("This\nis a test\nline 3\nline 4");
-		content.replaceTextRange(0, 5, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("is a test\nline 3\nline 4"));
-		assertWithMessage(":4b:", content.getLineCount() == 3);
-		assertWithMessage(":4c:", content.getLine(0).equals("is a test"));
-		assertWithMessage(":4d:", content.getLine(1).equals("line 3"));
-		assertWithMessage(":4e:", content.getLine(2).equals("line 4"));
-		content.replaceTextRange(16, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4f:", newText.equals("is a test\nline 3"));
-		assertWithMessage(":4g:", content.getLine(0).equals("is a test"));
-		assertWithMessage(":4h:", content.getLine(1).equals("line 3"));
-		content.replaceTextRange(9, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4i:", newText.equals("is a test"));
-		assertWithMessage(":4j:", content.getLine(0).equals("is a test"));
-		content.replaceTextRange(1, 8, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4k:", newText.equals("i"));
-		assertWithMessage(":4l:", content.getLine(0).equals("i"));
-		content.replaceTextRange(0, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4m:", newText.equals(""));
-		assertWithMessage(":4n:", content.getLine(0).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 9, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", newText.equals("This\n\r"));
-		assertWithMessage(":5b:", content.getLineCount() == 3);
-		assertWithMessage(":5c:", content.getLine(0).equals("This"));
-		assertWithMessage(":5d:", content.getLine(1).equals(""));
-		assertWithMessage(":5e:", content.getLine(2).equals(""));
-		content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
-		content.replaceTextRange(4, 8, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":6a:", newText.equals("L1\r\nL4\r\n"));
-		assertWithMessage(":6b:", content.getLineCount() == 3);
-		assertWithMessage(":6c:", content.getLine(0).equals("L1"));
-		assertWithMessage(":6d:", content.getLine(1).equals("L4"));
-		assertWithMessage(":6e:", content.getLine(2).equals(""));
-		content.setText("\nL1\r\nL2");
-		content.replaceTextRange(0, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7a:", newText.equals("L1\r\nL2"));
-		assertWithMessage(":7b:", content.getLineCount() == 2);
-		assertWithMessage(":7c:", content.getLine(0).equals("L1"));
-		assertWithMessage(":7d:", content.getLine(1).equals("L2"));
-		content.setText("\nL1\r\nL2\r\n");
-		content.replaceTextRange(7, 2, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8a:", newText.equals("\nL1\r\nL2"));
-		assertWithMessage(":8b:", content.getLineCount() == 3);
-		assertWithMessage(":8c:", content.getLine(0).equals(""));
-		assertWithMessage(":8d:", content.getLine(1).equals("L1"));
-		assertWithMessage(":8e:", content.getLine(2).equals("L2"));
-		content.setText("\nLine 1\nLine 2\n");
-		content.replaceTextRange(0, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":9a:", newText.equals("\nLine 2\n"));
-		assertWithMessage(":9b:", content.getLineCount() == 3);
-		assertWithMessage(":9c:", content.getLine(0).equals(""));
-		assertWithMessage(":9d:", content.getLine(1).equals("Line 2"));
-		assertWithMessage(":9e:", content.getLine(2).equals(""));
-		content.setText("Line 1\nLine 2\n");
-		content.replaceTextRange(6, 8, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":10a:", newText.equals("Line 1"));
-		assertWithMessage(":10b:", content.getLineCount() == 1);
-		assertWithMessage(":10c:", content.getLine(0).equals("Line 1"));
-		content.setText("Line one is short\r\nLine 2 is a longer line\r\nLine 3\n");
-		content.replaceTextRange(12, 17, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":11a:", newText.equals("Line one is a longer line\r\nLine 3\n"));
-		assertWithMessage(":11b:", content.getLineCount() == 3);
-		assertWithMessage(":11c:", content.getLine(0).equals("Line one is a longer line"));
-		assertWithMessage(":11d:", content.getLine(1).equals("Line 3"));
-		assertWithMessage(":11e:", content.getLine(2).equals(""));
-	}
-
-	public void test_Empty() {
-		StyledTextContent content = getContentInstance();
-		assertWithMessage(":1a:", content.getLineCount() == 1);
-		assertWithMessage(":1b:", content.getLine(0).equals(""));
-		content.setText("test");
-		content.replaceTextRange(0, 4, "");
-		assertWithMessage(":2a:", content.getLineCount() == 1);
-		assertWithMessage(":2b:", content.getLine(0).equals(""));
-	}
-
-	public void test_Insert() {
-		StyledTextContent content = getContentInstance();
-		String newText;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(0, 0, "test\n ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":1a:", newText.equals("test\n This\nis a test\r"));
-		assertWithMessage(":1b:", content.getLineCount() == 4);
-		assertWithMessage(":1c:", content.getLine(0).equals("test"));
-		assertWithMessage(":1d:", content.getLine(1).equals(" This"));
-		assertWithMessage(":1e:", content.getLine(2).equals("is a test"));
-		assertWithMessage(":1f:", content.getLine(3).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 0, "*** ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("This\n*** is a test\r"));
-		assertWithMessage(":2b:", content.getLineCount() == 3);
-		assertWithMessage(":2c:", content.getLine(0).equals("This"));
-		assertWithMessage(":2d:", content.getLine(1).equals("*** is a test"));
-		assertWithMessage(":2e:", content.getLine(2).equals(""));
-		content.setText("Line 1\r\nLine 2");
-		content.replaceTextRange(0, 0, "\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("\rLine 1\r\nLine 2"));
-		assertWithMessage(":3b:", content.getLineCount() == 3);
-		assertWithMessage(":3c:", content.getLine(0).equals(""));
-		assertWithMessage(":3d:", content.getLine(1).equals("Line 1"));
-		assertWithMessage(":3e:", content.getLine(2).equals("Line 2"));
-		content.replaceTextRange(9, 0, "\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3f:", newText.equals("\rLine 1\r\n\rLine 2"));
-		assertWithMessage(":3g:", content.getLineCount() == 4);
-		assertWithMessage(":3h:", content.getLine(0).equals(""));
-		assertWithMessage(":3i:", content.getLine(1).equals("Line 1"));
-		assertWithMessage(":3j:", content.getLine(2).equals(""));
-		assertWithMessage(":3k:", content.getLine(3).equals("Line 2"));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("\nThis\nis a test\r"));
-		assertWithMessage(":4b:", content.getLineCount() == 4);
-		assertWithMessage(":4c:", content.getLine(0).equals(""));
-		assertWithMessage(":4d:", content.getLine(1).equals("This"));
-		assertWithMessage(":4e:", content.getLine(2).equals("is a test"));
-		assertWithMessage(":4f:", content.getLine(3).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(7, 0, "\r\nnewLine");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", newText.equals("This\nis\r\nnewLine a test\r"));
-		assertWithMessage(":5b:", content.getLineCount() == 4);
-		assertWithMessage(":5c:", content.getLine(0).equals("This"));
-		assertWithMessage(":5d:", content.getLine(1).equals("is"));
-		assertWithMessage(":5e:", content.getLine(2).equals("newLine a test"));
-		assertWithMessage(":5f:", content.getLine(3).equals(""));
-		content.setText("");
-		content.replaceTextRange(0, 0, "This\nis\r\nnewLine a test\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":6a:", newText.equals("This\nis\r\nnewLine a test\r"));
-		assertWithMessage(":6b:", content.getLineCount() == 4);
-		assertWithMessage(":6c:", content.getLine(0).equals("This"));
-		assertWithMessage(":6d:", content.getLine(1).equals("is"));
-		assertWithMessage(":6e:", content.getLine(2).equals("newLine a test"));
-		assertWithMessage(":6f:", content.getLine(3).equals(""));
-		// insert at end
-		content.setText("This");
-		content.replaceTextRange(4, 0, "\n ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7a:", newText.equals("This\n "));
-		assertWithMessage(":7b:", content.getLineCount() == 2);
-		assertWithMessage(":7c:", content.getLine(0).equals("This"));
-		assertWithMessage(":7d:", content.getLine(1).equals(" "));
-		content.setText("This\n");
-		content.replaceTextRange(5, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7e:", newText.equals("This\n\n"));
-		assertWithMessage(":7f:", content.getLineCount() == 3);
-		assertWithMessage(":7g:", content.getLine(0).equals("This"));
-		assertWithMessage(":7h:", content.getLine(1).equals(""));
-		assertWithMessage(":7i:", content.getLine(2).equals(""));
-		// insert at beginning
-		content.setText("This");
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8a:", newText.equals("\nThis"));
-		assertWithMessage(":8b:", content.getLineCount() == 2);
-		assertWithMessage(":8c:", content.getLine(0).equals(""));
-		assertWithMessage(":8d:", content.getLine(1).equals("This"));
-		// insert text
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 0, "*** ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":9a:", newText.equals("This\n*** is a test\r"));
-		assertWithMessage(":9b:", content.getLineCount() == 3);
-		assertWithMessage(":9c:", content.getLine(0).equals("This"));
-		assertWithMessage(":9d:", content.getLine(1).equals("*** is a test"));
-		assertWithMessage(":9e:", content.getLine(2).equals(""));
-		content.setText("This\n");
-		content.replaceTextRange(5, 0, "line");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":10a:", newText.equals("This\nline"));
-		assertWithMessage(":10b:", content.getLineCount() == 2);
-		assertWithMessage(":10c:", content.getLine(0).equals("This"));
-		assertWithMessage(":10d:", content.getLine(1).equals("line"));
-		assertWithMessage(":10e:", content.getLineAtOffset(8) == 1);
-		assertWithMessage(":10f:", content.getLineAtOffset(9) == 1);
-		// insert at beginning
-		content.setText("This\n");
-		content.replaceTextRange(0, 0, "line\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":11a:", newText.equals("line\nThis\n"));
-		assertWithMessage(":11b:", content.getLineCount() == 3);
-		assertWithMessage(":11c:", content.getLine(0).equals("line"));
-		assertWithMessage(":11d:", content.getLine(1).equals("This"));
-		assertWithMessage(":11e:", content.getLineAtOffset(5) == 1);
-		content.setText("Line 1\r\nLine 2\r\nLine 3");
-		content.replaceTextRange(0, 0, "\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":12a:", newText.equals("\rLine 1\r\nLine 2\r\nLine 3"));
-		assertWithMessage(":12b:", content.getLineCount() == 4);
-		assertWithMessage(":12c:", content.getLine(0).equals(""));
-		assertWithMessage(":12d:", content.getLine(1).equals("Line 1"));
-		assertWithMessage(":12e:", content.getLine(2).equals("Line 2"));
-		assertWithMessage(":12f:", content.getLine(3).equals("Line 3"));
-		content.setText("Line 1\nLine 2\nLine 3");
-		content.replaceTextRange(7, 0, "Line1a\nLine1b\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":13a:", newText.equals("Line 1\nLine1a\nLine1b\nLine 2\nLine 3"));
-		assertWithMessage(":13b:", content.getLineCount() == 5);
-		assertWithMessage(":13c:", content.getLine(0).equals("Line 1"));
-		assertWithMessage(":13d:", content.getLine(1).equals("Line1a"));
-		assertWithMessage(":13e:", content.getLine(2).equals("Line1b"));
-		assertWithMessage(":13f:", content.getLine(3).equals("Line 2"));
-		assertWithMessage(":13g:", content.getLine(4).equals("Line 3"));
-		content.setText("Line 1\nLine 2\nLine 3");
-		content.replaceTextRange(11, 0, "l1a");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":14a:", newText.equals("Line 1\nLinel1a 2\nLine 3"));
-		assertWithMessage(":14b:", content.getLineCount() == 3);
-		assertWithMessage(":14c:", content.getLine(0).equals("Line 1"));
-		assertWithMessage(":14d:", content.getLine(1).equals("Linel1a 2"));
-		assertWithMessage(":14e:", content.getLine(2).equals("Line 3"));
-		content.setText("Line 1\nLine 2 is a very long line that spans many words\nLine 3");
-		content.replaceTextRange(19, 0, "very, very, ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":15a:", newText.equals("Line 1\nLine 2 is a very, very, very long line that spans many words\nLine 3"));
-		assertWithMessage(":15b:", content.getLineCount() == 3);
-		assertWithMessage(":15c:", content.getLine(0).equals("Line 1"));
-		assertWithMessage(":15d:", content.getLine(1).equals("Line 2 is a very, very, very long line that spans many words"));
-		assertWithMessage(":15e:", content.getLine(2).equals("Line 3"));
-	}
-
-	public void test_Line_Conversion() {
-		StyledTextContent content = getContentInstance();
-		content.setText("This\nis a test\rrepeat\nend\r");
-		assertWithMessage(":1a:", content.getLineCount() == 5);
-		assertWithMessage(":1b:", content.getLine(0).equals("This"));
-		assertWithMessage(":1c:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":1d:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":1e:", content.getLineAtOffset(4) == 0);
-		assertWithMessage(":1f:", content.getOffsetAtLine(1) == 5);
-		assertWithMessage(":1g:", content.getLine(2).equals("repeat"));
-		assertWithMessage(":1h:", content.getOffsetAtLine(2) == 15);
-		assertWithMessage(":1i:", content.getLine(3).equals("end"));
-		assertWithMessage(":1j:", content.getOffsetAtLine(3) == 22);
-		assertWithMessage(":1k:", content.getLine(4).equals(""));
-		assertWithMessage(":1l:", content.getOffsetAtLine(4) == 26);
-		content.setText("This\r\nis a test");
-		assertWithMessage(":2a:", content.getLineCount() == 2);
-		assertWithMessage(":2b:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":2c:", content.getLineAtOffset(4) == 0);
-		assertWithMessage(":2d:", content.getLineAtOffset(5) == 0);
-		content.setText("This\r\nis a test\r");
-		assertWithMessage(":3a:", content.getLineCount() == 3);
-		assertWithMessage(":3b:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":3c:", content.getLineAtOffset(15) == 1);
-		content.setText("\r\n");
-		assertWithMessage(":4a:", content.getLineCount() == 2);
-		assertWithMessage(":4b:", content.getLine(0).equals(""));
-		assertWithMessage(":4c:", content.getLine(1).equals(""));
-		assertWithMessage(":4d:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":4e:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":4f:", content.getLineAtOffset(2) == 1);
-		content.setText("\r\n\n\r\r\n");
-		assertWithMessage(":5a:", content.getLineCount() == 5);
-		assertWithMessage(":5b:", content.getLine(0).equals(""));
-		assertWithMessage(":5c:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":5d:", content.getLine(1).equals(""));
-		assertWithMessage(":5e:", content.getOffsetAtLine(1) == 2);
-		assertWithMessage(":5f:", content.getLine(2).equals(""));
-		assertWithMessage(":5g:", content.getOffsetAtLine(2) == 3);
-		assertWithMessage(":5h:", content.getLine(3).equals(""));
-		assertWithMessage(":5i:", content.getOffsetAtLine(3) == 4);
-		assertWithMessage(":5j:", content.getLine(4).equals(""));
-		assertWithMessage(":5k:", content.getOffsetAtLine(4) == 6);
-		content.setText("test\r\rtest2\r\r");
-		assertWithMessage(":6a:", content.getLineCount() == 5);
-		assertWithMessage(":6b:", content.getLine(0).equals("test"));
-		assertWithMessage(":6c:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":6d:", content.getLine(1).equals(""));
-		assertWithMessage(":6e:", content.getOffsetAtLine(1) == 5);
-		assertWithMessage(":6f:", content.getLine(2).equals("test2"));
-		assertWithMessage(":6g:", content.getOffsetAtLine(2) == 6);
-		assertWithMessage(":6h:", content.getLine(3).equals(""));
-		assertWithMessage(":6i:", content.getOffsetAtLine(3) == 12);
-		assertWithMessage(":6j:", content.getLine(4).equals(""));
-		assertWithMessage(":6k:", content.getOffsetAtLine(4) == 13);
-	}
-
-	public void test_Line_To_Offset() {
-		StyledTextContent content = getContentInstance();
-		content.setText("This\nis a test\rrepeat\nend\r");
-		assertWithMessage(":1a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":1b:", content.getOffsetAtLine(1) == 5);
-		assertWithMessage(":1c:", content.getOffsetAtLine(2) == 15);
-		assertWithMessage(":1d:", content.getOffsetAtLine(3) == 22);
-		assertWithMessage(":1e:", content.getOffsetAtLine(4) == 26);
-		content.setText("This\r\nis a test");
-		assertWithMessage(":2a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":2b:", content.getOffsetAtLine(1) == 6);
-		content.setText("\r\n");
-		assertWithMessage(":3a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":3b:", content.getOffsetAtLine(1) == 2);
-		content.setText("\r\n\n\r\r\n");
-		assertWithMessage(":4a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":4b:", content.getOffsetAtLine(1) == 2);
-		assertWithMessage(":4c:", content.getOffsetAtLine(2) == 3);
-		assertWithMessage(":4d:", content.getOffsetAtLine(3) == 4);
-		assertWithMessage(":4e:", content.getOffsetAtLine(4) == 6);
-		content.setText("\r\ntest\r\n");
-		assertWithMessage(":5a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":5b:", content.getOffsetAtLine(1) == 2);
-		assertWithMessage(":5c:", content.getOffsetAtLine(2) == 8);
-	}
-
-	public void test_Offset_To_Line() {
-		StyledTextContent content = getContentInstance();
-		content.setText("This\nis a test\rrepeat\nend\r");
-		assertWithMessage(":1a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":1b:", content.getLineAtOffset(3) == 0);
-		assertWithMessage(":1c:", content.getLineAtOffset(4) == 0);
-		assertWithMessage(":1d:", content.getLineAtOffset(25) == 3);
-		assertWithMessage(":1e:", content.getLineAtOffset(26) == 4);
-		content.setText("This\r\nis a test");
-		assertWithMessage(":2a:", content.getLineAtOffset(5) == 0);
-		assertWithMessage(":2b:", content.getLineAtOffset(6) == 1);
-		assertWithMessage(":2c:", content.getLineAtOffset(10) == 1);
-		content.setText("\r\n");
-		assertWithMessage(":3a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":3b:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":3c:", content.getLineAtOffset(2) == 1);
-		content.setText("\r\n\n\r\r\n");
-		assertWithMessage(":4a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":4b:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":4c:", content.getLineAtOffset(2) == 1);
-		assertWithMessage(":4d:", content.getLineAtOffset(3) == 2);
-		assertWithMessage(":4e:", content.getLineAtOffset(4) == 3);
-		assertWithMessage(":4f:", content.getLineAtOffset(5) == 3);
-		assertWithMessage(":4g:", content.getLineAtOffset(6) == 4);
-		content.setText("\r\n\r\n");
-		assertWithMessage(":5a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":5b:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":5c:", content.getLineAtOffset(2) == 1);
-		assertWithMessage(":5d:", content.getLineAtOffset(3) == 1);
-		assertWithMessage(":5e:", content.getLineAtOffset(4) == 2);
-		content.setText("\r\r\r\n\r\n");
-		assertWithMessage(":6a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":6b:", content.getLineAtOffset(1) == 1);
-		assertWithMessage(":6c:", content.getLineAtOffset(2) == 2);
-		assertWithMessage(":6d:", content.getLineAtOffset(4) == 3);
-		content.setText("");
-		assertWithMessage(":7a:", content.getLineAtOffset(0) == 0);
-		content = getContentInstance();
-		assertWithMessage(":8a:", content.getLineAtOffset(0) == 0);
-	}
-
-	public void test_Replace() {
-		StyledTextContent content = getContentInstance();
-		String newText;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 4, "a");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":1a:", newText.equals("This\na test\r"));
-		assertWithMessage(":1b:", content.getLineCount() == 3);
-		assertWithMessage(":1c:", content.getLine(0).equals("This"));
-		assertWithMessage(":1d:", content.getLine(1).equals("a test"));
-		assertWithMessage(":1e:", content.getLine(2).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 2, "was");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("This\nwas a test\r"));
-		assertWithMessage(":2b:", content.getLineCount() == 3);
-		assertWithMessage(":2c:", content.getLine(0).equals("This"));
-		assertWithMessage(":2d:", content.getLine(1).equals("was a test"));
-		assertWithMessage(":2e:", content.getLine(2).equals(""));
-		content.setText("This is a test\r");
-		content.replaceTextRange(5, 2, "was");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("This was a test\r"));
-		assertWithMessage(":3b:", content.getLineCount() == 2);
-		assertWithMessage(":3c:", content.getLine(0).equals("This was a test"));
-		assertWithMessage(":3d:", content.getLineAtOffset(15) == 0);
-		content.setText("Line 1\nLine 2\nLine 3");
-		content.replaceTextRange(0, 7, "La\nLb\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("La\nLb\nLine 2\nLine 3"));
-		assertWithMessage(":4b:", content.getLine(0).equals("La"));
-		assertWithMessage(":4c:", content.getLine(1).equals("Lb"));
-		assertWithMessage(":4d:", content.getLine(2).equals("Line 2"));
-		assertWithMessage(":4e:", content.getLine(3).equals("Line 3"));
-		content.setText(getTestText());
-		newText = content.getTextRange(0, content.getCharCount());
-		int start = content.getOffsetAtLine(6);
-		int end = content.getOffsetAtLine(11);
-		content.replaceTextRange(start, end - start, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", content.getLineCount() == 12);
-		assertWithMessage(":5a:", content.getLine(5).equals(""));
-		assertWithMessage(":5a:", content.getLine(6).equals(""));
-		start = content.getOffsetAtLine(7);
-		content.replaceTextRange(start, content.getCharCount() - start, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", content.getLineCount() == 8);
-		assertWithMessage(":5a:", content.getLine(5).equals(""));
-		assertWithMessage(":5a:", content.getLine(6).equals(""));
-		assertWithMessage(":5a:", content.getLine(7).equals(""));
-	}
-
-	public void test_Special_Cases() {
-		String newText;
-		StyledTextContent content = getContentInstance();
-		assertWithMessage(":0a:", content.getLineCount() == 1);
-		assertWithMessage(":0b:", content.getOffsetAtLine(0) == 0);
-		content.setText("This is the input/output text component.");
-		content.replaceTextRange(0, 0, "\n");
-		assertWithMessage(":1a:", content.getLine(0).equals(""));
-		content.replaceTextRange(1, 0, "\n");
-		assertWithMessage(":1b:", content.getLine(0).equals(""));
-		content.replaceTextRange(2, 0, "\n");
-		assertWithMessage(":1c:", content.getLine(0).equals(""));
-		content.replaceTextRange(3, 0, "\n");
-		assertWithMessage(":1d:", content.getLine(0).equals(""));
-		content.replaceTextRange(4, 0, "\n");
-		assertWithMessage(":1e:", content.getLine(0).equals(""));
-		content.replaceTextRange(5, 0, "\n");
-		assertWithMessage(":1f:", content.getLine(0).equals(""));
-		content.replaceTextRange(6, 0, "\n");
-		assertWithMessage(":1g:", content.getLine(0).equals(""));
-		content.replaceTextRange(7, 0, "\n");
-		assertWithMessage(":1h:", content.getLine(0).equals(""));
-		content.setText("This is the input/output text component.");
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("\nThis is the input/output text component."));
-		assertWithMessage(":2b:", content.getLine(0).equals(""));
-		assertWithMessage(":2c:", content.getLine(1).equals("This is the input/output text component."));
-		content.replaceTextRange(1, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2d:", newText.equals("\n\nThis is the input/output text component."));
-		assertWithMessage(":2e:", content.getLine(0).equals(""));
-		assertWithMessage(":2f:", content.getLine(1).equals(""));
-		assertWithMessage(":2g:", content.getLine(2).equals("This is the input/output text component."));
-		content.replaceTextRange(2, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("\n\n\nThis is the input/output text component."));
-		assertWithMessage(":3b:", content.getLine(0).equals(""));
-		assertWithMessage(":3c:", content.getLine(1).equals(""));
-		assertWithMessage(":3d:", content.getLine(2).equals(""));
-		assertWithMessage(":3e:", content.getLine(3).equals("This is the input/output text component."));
-		content.replaceTextRange(3, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3f:", newText.equals("\n\n\n\nThis is the input/output text component."));
-		assertWithMessage(":3g:", content.getLine(0).equals(""));
-		assertWithMessage(":3h:", content.getLine(1).equals(""));
-		assertWithMessage(":3i:", content.getLine(2).equals(""));
-		assertWithMessage(":3j:", content.getLine(3).equals(""));
-		assertWithMessage(":3k:", content.getLine(4).equals("This is the input/output text component."));
-		content.replaceTextRange(3, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("\n\n\nThis is the input/output text component."));
-		assertWithMessage(":4b:", content.getLine(0).equals(""));
-		assertWithMessage(":4c:", content.getLine(1).equals(""));
-		assertWithMessage(":4d:", content.getLine(2).equals(""));
-		assertWithMessage(":4e:", content.getLine(3).equals("This is the input/output text component."));
-		content.replaceTextRange(2, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4f:", newText.equals("\n\nThis is the input/output text component."));
-		assertWithMessage(":4g:", content.getLine(0).equals(""));
-		assertWithMessage(":4h:", content.getLine(1).equals(""));
-		assertWithMessage(":4i:", content.getLine(2).equals("This is the input/output text component."));
-		content.replaceTextRange(2, 0, "a");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", newText.equals("\n\naThis is the input/output text component."));
-		assertWithMessage(":5b:", content.getLine(0).equals(""));
-		assertWithMessage(":5c:", content.getLine(1).equals(""));
-		assertWithMessage(":5d:", content.getLine(2).equals("aThis is the input/output text component."));
-		// delete only part of a delimiter
-		content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
-		content.replaceTextRange(0, 3, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5e:", newText.equals("\nL2\r\nL3\r\nL4\r\n"));
-		assertWithMessage(":5f:", content.getLineCount() == 5);
-		assertWithMessage(":5g:", content.getLine(0).equals(""));
-		assertWithMessage(":5h:", content.getLine(1).equals("L2"));
-		assertWithMessage(":5i:", content.getLine(2).equals("L3"));
-		assertWithMessage(":5j:", content.getLine(3).equals("L4"));
-		assertWithMessage(":5k:", content.getLine(4).equals(""));
-		// replace part of a delimiter
-		content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
-		content.replaceTextRange(3, 1, "test\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":6a:", newText.equals("L1\rtest\nL2\r\nL3\r\nL4\r\n"));
-		assertWithMessage(":6b:", content.getLineCount() == 6);
-		assertWithMessage(":6c:", content.getLine(0).equals("L1"));
-		assertWithMessage(":6d:", content.getLine(1).equals("test"));
-		assertWithMessage(":6e:", content.getLine(2).equals("L2"));
-		assertWithMessage(":6f:", content.getLine(3).equals("L3"));
-		assertWithMessage(":6g:", content.getLine(4).equals("L4"));
-		assertWithMessage(":6h:", content.getLine(5).equals(""));
-		content.setText("abc\r\ndef");
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7a:", newText.equals("ac\r\ndef"));
-		assertWithMessage(":7b:", content.getLineCount() == 2);
-		assertWithMessage(":7c:", content.getLine(0).equals("ac"));
-		assertWithMessage(":7d:", content.getLine(1).equals("def"));
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7e:", newText.equals("a\r\ndef"));
-		assertWithMessage(":7f:", content.getLineCount() == 2);
-		assertWithMessage(":7g:", content.getLine(0).equals("a"));
-		assertWithMessage(":7h:", content.getLine(1).equals("def"));
-		content.replaceTextRange(1, 2, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7i:", newText.equals("adef"));
-		assertWithMessage(":7j:", content.getLineCount() == 1);
-		assertWithMessage(":7k:", content.getLine(0).equals("adef"));
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7l:", newText.equals("aef"));
-		assertWithMessage(":7m:", content.getLineCount() == 1);
-		assertWithMessage(":7n:", content.getLine(0).equals("aef"));
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7o:", newText.equals("af"));
-		assertWithMessage(":7p:", content.getLineCount() == 1);
-		assertWithMessage(":7q:", content.getLine(0).equals("af"));
-		content.setText("abc");
-		content.replaceTextRange(0, 1, "1");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8a:", content.getLineCount() == 1);
-		assertWithMessage(":8b:", newText.equals("1bc"));
-		assertWithMessage(":8c:", content.getLine(0).equals("1bc"));
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8d:", newText.equals("\n1bc"));
-		assertWithMessage(":8e:", content.getLineCount() == 2);
-		assertWithMessage(":8f:", content.getLine(0).equals(""));
-		assertWithMessage(":8g:", content.getLine(1).equals("1bc"));
-		content = getContentInstance();
-		content.replaceTextRange(0, 0, "a");
-		content.setText("package test;\n/* Line 1\n * Line 2\n */\npublic class SimpleClass {\n}");
-		content.replaceTextRange(14, 23, "\t/*Line 1\n\t * Line 2\n\t */");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":9a:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));
-		assertWithMessage(":9b:", content.getLineCount() == 6);
-		assertWithMessage(":9c:", content.getLine(0).equals("package test;"));
-		assertWithMessage(":9d:", content.getLine(1).equals("\t/*Line 1"));
-		assertWithMessage(":9e:", content.getLine(2).equals("\t * Line 2"));
-		assertWithMessage(":9f:", content.getLine(3).equals("\t */"));
-		assertWithMessage(":9g:", content.getLine(4).equals("public class SimpleClass {"));
-		assertWithMessage(":9h:", content.getLine(5).equals("}"));
-	}
-
-	public void test_Text_Changed_Event() {
-		StyledTextContent content = getContentInstance();
-		content.addTextChangeListener(this);
-		verify = 1;
-		content.setText("testing");
-		content.replaceTextRange(0, 0, "\n");
-		verify = 2;
-		content.setText("\n\n");
-		content.replaceTextRange(0, 2, "a");
-		verify = 3;
-		content.setText("a");
-		content.replaceTextRange(0, 1, "\n\n");
-		verify = 5;
-		content.setText("Line 1\r\nLine 2");
-		content.replaceTextRange(0, 0, "\r");
-		verify = 6;
-		content.setText("This\nis a test\nline 3\nline 4");
-		content.replaceTextRange(21, 7, "");
-		verify = 7;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 9, "");
-		verify = 8;
-		content.setText("\nL1\r\nL2\r\n");
-		content.replaceTextRange(7, 2, "");
-		verify = 9;
-		content.setText("L1\r\n");
-		content.replaceTextRange(2, 2, "test");
-		verify = 0;
-		content.removeTextChangeListener(this);
-	}
-
-	public void textChanged(TextChangedEvent event) {
-	}
-
-	public void textChanging(TextChangingEvent event) {
-		switch (verify) {
-			case 1 :
-				{
-					assertWithMessage(":1a:", event.replaceLineCount == 0);
-					assertWithMessage(":1b:", event.newLineCount == 1);
-					break;
-				}
-			case 2 :
-				{
-					assertWithMessage(":2a:", event.replaceLineCount == 2);
-					assertWithMessage(":2b:", event.newLineCount == 0);
-					break;
-				}
-			case 3 :
-				{
-					assertWithMessage(":3a:", event.replaceLineCount == 0);
-					assertWithMessage(":3b:", event.newLineCount == 2);
-					break;
-				}
-			case 4 :
-				{
-					assertWithMessage(":4a:", event.replaceLineCount == 0);
-					assertWithMessage(":4b:", event.newLineCount == 1);
-					break;
-				}
-			case 5 :
-				{
-					assertWithMessage(":5a:", event.replaceLineCount == 0);
-					assertWithMessage(":5b:", event.newLineCount == 1);
-					break;
-				}
-			case 6 :
-				{
-					assertWithMessage(":6a:", event.replaceLineCount == 1);
-					assertWithMessage(":6b:", event.newLineCount == 0);
-					break;
-				}
-			case 8 :
-				{
-					assertWithMessage(":8a:", event.replaceLineCount == 1);
-					assertWithMessage(":8b:", event.newLineCount == 0);
-					break;
-				}
-			case 9 :
-				{
-					assertWithMessage(":9a:", event.replaceLineCount == 1);
-					assertWithMessage(":9b:", event.newLineCount == 0);
-					break;
-				}
-			case 10 :
-				{
-					assertWithMessage(":10a:", event.replaceLineCount == 0);
-					assertWithMessage(":10b:", event.newLineCount == 0);
-					break;
-				}
-			case 11 :
-				{
-					assertWithMessage(":11a:", event.replaceLineCount == 0);
-					assertWithMessage(":11b:", event.newLineCount == 0);
-					break;
-				}
-			case 12 :
-				{
-					assertWithMessage(":12a:", event.replaceLineCount == 0);
-					assertWithMessage(":12b:", event.newLineCount == 0);
-					break;
-				}
-			case 13 :
-				{
-					assertWithMessage(":13a:", event.replaceLineCount == 0);
-					assertWithMessage(":13b:", event.newLineCount == 0);
-					break;
-				}
-			case 14 :
-				{
-					assertWithMessage(":14a:", event.replaceLineCount == 0);
-					assertWithMessage(":14b:", event.newLineCount == 1);
-					break;
-				}
-			case 15 :
-				{
-					assertWithMessage(":15a:", event.replaceLineCount == 1);
-					assertWithMessage(":15b:", event.newLineCount == 2);
-					break;
-				}
-			case 16 :
-				{
-					assertWithMessage(":16a:", event.replaceLineCount == 0);
-					assertWithMessage(":16b:", event.newLineCount == 1);
-					break;
-				}
-			case 17 :
-				{
-					assertWithMessage(":17a:", event.replaceLineCount == 0);
-					assertWithMessage(":17b:", event.newLineCount == 2);
-					break;
-				}
-			case 18 :
-				{
-					assertWithMessage(":18a:", event.replaceLineCount == 0);
-					assertWithMessage(":18b:", event.newLineCount == 1);
-					break;
-				}
-			case 19 :
-				{
-					assertWithMessage(":19a:", event.replaceLineCount == 0);
-					assertWithMessage(":19b:", event.newLineCount == 4);
-					break;
-				}
-			case 20 :
-				{
-					assertWithMessage(":20a:", event.replaceLineCount == 0);
-					assertWithMessage(":20b:", event.newLineCount == 2);
-					break;
-				}
-		}
-	}
-
-	public void textSet(TextChangedEvent event) {
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
deleted file mode 100644
index 2876f483c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
+++ /dev/null
@@ -1,98 +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.ui.tests.other;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here.
- * Creation date: (3/20/2001 6:19:58 PM)
- * @author: David Williams
- */
-public class StyledTextTest {
-	/**
-	 * StyledTextTest constructor comment.
-	 */
-	public StyledTextTest() {
-		super();
-	}
-
-	/**
-	 * Don't forget, the *swt*.dll will have to be copied to program directory for this to work.
-	 */
-	public static void main(String[] args) {
-
-		try {
-			Shell shell = new Shell();
-			GridLayout layout = new GridLayout();
-			shell.setLayout(layout);
-
-			Button button = new Button(shell, SWT.PUSH);
-			button.setText("Action");
-			button.addListener(SWT.Selection, new Listener() {
-				public void handleEvent(Event e) {
-					System.out.println("button pushed");
-				}
-			});
-
-			StyledText text = new StyledText(shell, SWT.BORDER + SWT.H_SCROLL + SWT.V_SCROLL);
-			GridData data = new GridData(GridData.FILL_BOTH);
-			text.setLayoutData(data);
-
-			//
-			//		String fileName = System.getProperty("user.dir") + "\\" + "japanese_utf-16.txt";
-			//		String encoding = "UnicodeBig";
-
-			String fileName = System.getProperty("user.dir") + "\\" + "japanese_cp1252.txt";
-			String encoding = "Cp1252";
-			//sun.io.ByteToCharConverter.getDefault().toString();
-
-			System.out.println("Test file: " + fileName);
-			System.out.println("   Encoding: " + encoding);
-
-			InputStream in = new FileInputStream(fileName);
-			InputStreamReader inStream = new InputStreamReader(in, encoding);
-			//Reader inStream = new FileReader(fileName);
-			StringBuffer sb = new StringBuffer();
-			while (inStream.ready()) {
-				sb.append((char) inStream.read());
-			}
-			String inputString = sb.toString();
-			System.out.println("Length of input: " + inputString.length());
-			//
-			text.setText(inputString);
-
-			shell.setSize(400, 200);
-			shell.open();
-
-			Display display = shell.getDisplay();
-			while (shell != null && !shell.isDisposed()) {
-				if (!display.readAndDispatch())
-					display.sleep();
-			}
-		}
-		catch (Exception t) {
-			t.printStackTrace();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
deleted file mode 100644
index b9f0cfb8d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ /dev/null
@@ -1,1798 +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.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class UnitTests extends TestCase {
-
-	protected IStructuredDocument fModel;
-	protected IDOMModel tree;
-	protected int eventCase = 1;
-	protected boolean eventResult;
-
-	public static final int GENERIC_NODES_REPLACED_EVENT_CASE = 1001;
-	public static final int GENERIC_REGIONS_REPLACED_EVENT_CASE = 1002;
-	public static final int GENERIC_REGION_CHANGED_EVENT_CASE = 1003;
-	public static final int GENERIC_NEW_MODEL_EVENT_CASE = 1004;
-	public static final int GENERIC_NO_CHANGE_EVENT_CASE = 1005;
-
-	protected class StructuredDocumentListenerProxy implements IStructuredDocumentListener {
-		public void newModel(NewDocumentEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void noChange(NoChangeEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-	}
-
-	protected StructuredDocumentListenerProxy proxy = new StructuredDocumentListenerProxy();
-
-	/**
-	 * MinimizationTest constructor comment.
-	 */
-	public UnitTests(String name) {
-		super(name);
-	}
-
-	protected void handleEvent(StructuredDocumentEvent structuredDocumentEvent) {
-		eventResult = false;
-		switch (eventCase) {
-			case 1 :
-				{
-					if (structuredDocumentEvent instanceof NoChangeEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 2 :
-				{
-					if (structuredDocumentEvent instanceof NoChangeEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 3 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 4 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 5 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 6 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
-									if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
-										eventResult = true; // ok
-									}
-					}
-					break;
-				}
-			case 7 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								eventResult = true; // ok
-					}
-
-					break;
-				}
-			case 8 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								//if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
-								//if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 9 :
-			case 10 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
-									if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
-										eventResult = true; // ok
-					}
-					break;
-				}
-			case 11 :
-			case 12 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
-									if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
-										eventResult = true; // ok
-					}
-					break;
-				}
-			case 13 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size())
-							if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size())
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 14 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 15 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						RegionChangedEvent regionChangedEvent = (RegionChangedEvent) structuredDocumentEvent;
-						IStructuredDocumentRegion documentRegion = ((RegionChangedEvent) structuredDocumentEvent).getStructuredDocumentRegion();
-						if ("b ".equals(documentRegion.getFullText(regionChangedEvent.getRegion()))) {
-							eventResult = true; // ok
-						}
-					}
-					break;
-				}
-			case 16 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (0 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
-							if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
-								eventResult = true; // ok
-							}
-						}
-					}
-					break;
-				}
-			case 17 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
-							if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
-								eventResult = true; // ok
-							}
-						}
-					}
-					break;
-				}
-			case 18 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
-							if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
-								eventResult = true; // ok
-							}
-						}
-					}
-					break;
-				}
-			case 19 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 20 :
-			case 21 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 22 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 23 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 24 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 25 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 26 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			// JSP5
-			case 27 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 28 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 29 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 30 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			// JSP6
-			case 31 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 32 :
-				{
-					// changed 2002, 9/12 to fit -- this is definitely a change
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						RegionsReplacedEvent regionsReplacedEvent = (RegionsReplacedEvent) structuredDocumentEvent;
-						if (1 == regionsReplacedEvent.getOldRegions().size()) {
-							ITextRegion region = regionsReplacedEvent.getOldRegions().get(0);
-							IStructuredDocumentRegion documentRegion = regionsReplacedEvent.getStructuredDocumentRegion();
-							String text = documentRegion.getText(region);
-							if ("<% aaa %>".equals(text)) {
-								eventResult = true; // ok
-							}
-
-						}
-					}
-					else if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						StructuredDocumentRegionsReplacedEvent nodesReplacedEvent = (StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent;
-						IStructuredDocumentRegionList regions = nodesReplacedEvent.getNewStructuredDocumentRegions();
-
-						if (1 == regions.getLength()) {
-							IStructuredDocumentRegion region = regions.item(0);
-							String text = region.getText();
-							//System.out.println(text);
-							if ("<c<% aaa ".equals(text)) {
-								eventResult = true;
-							}
-						}
-
-					}
-					break;
-				}
-			case 33 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						//					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 34 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-
-			case 35 :
-				{
-					// chanced to RegionsReplaced 2002, 9/11 (attribute value to region container)
-					//					String startString = "<p><img src=\"file.gif\"><p>";
-					//					String changes = "<";
-					//					String expectedString = "<p><img src=\"file<.gif\"><p>";
-
-					//				if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 36 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 37 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 38 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 39 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 40 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-
-			case GENERIC_NODES_REPLACED_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_REGIONS_REPLACED_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_REGION_CHANGED_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_NEW_MODEL_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof NewDocumentEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_NO_CHANGE_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof NoChangeEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-
-			default :
-				{
-					if (structuredDocumentEvent instanceof NewDocumentEvent) {
-						eventResult = true; // ok
-					}
-				}
-		}
-	}
-
-	/**
-	 * Starts the application.
-	 * @param args an array of command-line arguments
-	 */
-	public static void main(java.lang.String[] args) {
-		if (args.length == 0) {
-			runAll();
-		}
-		else if (args.length == 1) {
-			String methodToRun = args[0].trim();
-			runOne(methodToRun);
-		}
-	}
-
-	protected static void runAll() {
-		junit.textui.TestRunner.run(suite());
-
-	}
-
-	public static void runOne(String methodName) {
-		TestSuite testSuite = new TestSuite();
-		TestCase test = new UnitTests(methodName);
-		testSuite.addTest(test);
-		junit.textui.TestRunner.run(testSuite);
-
-	}
-
-	/**
-	 * Set up an XML model
-	 */
-	protected void setUpXML() {
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			fModel = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		fModel.addDocumentChangedListener(proxy);
-
-		tree = new DOMModelImpl();
-
-		if (tree != null) {
-			fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
-			tree.setStructuredDocument(fModel);
-		}
-
-	}
-
-	/**
-	 * Set up a JSP model
-	 */
-	protected void setUpJSP() {
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			fModel = mm.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		fModel = StructuredDocumentFactory.getNewStructuredDocumentInstance(new JSPSourceParser());
-
-		fModel.addDocumentChangedListener(proxy);
-
-		tree = new DOMModelImpl();
-
-		if (tree != null) {
-			fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
-			tree.setStructuredDocument(fModel);
-		}
-
-	}
-
-	/**
-	 */
-	public void simpleTest()  {
-
-		setUpJSP();
-		eventCase = 99;
-		String startString = "";
-		String changes = "<a></a>";
-		String expectedString = "<a></a>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		//
-		fModel.setText(null, startString);
-
-		//
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void simpleTest2()  {
-
-		setUpXML();
-		eventCase = 99;
-		String startString = "";
-		String changes = "<a></a>";
-		String expectedString = "<a></a>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void simpleTest3()  {
-
-		setUpXML();
-		eventCase = 99;
-		String startString = "<a></a>";
-		String changes = "";
-		String expectedString = "<a></a>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:16:02 PM)
-	 * @return junit.framework.Test
-	 */
-	protected static Test suite() {
-		return new TestSuite(UnitTests.class);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:28:59 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testDeleteBeginning()  {
-
-		setUpXML();
-		eventCase = 4;
-		String expectedString = "<GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 0, 10, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:27:31 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testDeleteEnd()  {
-
-		setUpXML();
-		eventCase = 3;
-		String expectedString = "<ABC><DEF>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 10, 5, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 */
-	public void testEmbedded()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
-		String startString = "<p><img src=\"file.gif\"><p>";
-		String changes = "<";
-		String expectedString = "<p><img src=\"file<.gif\"><p>";
-		int startOfChanges = 17;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		eventCase = 35;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("part 1: text update", result);
-		assertTrue("part 1: event type", eventResult);
-
-		eventCase = 36;
-		startString = expectedString;
-		changes = "%";
-		expectedString = "<p><img src=\"file<%.gif\"><p>";
-		startOfChanges = 18;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 2: text update", result);
-		assertTrue("part 2: event type", eventResult);
-
-		eventCase = 37;
-		startString = expectedString;
-		changes = " ";
-		expectedString = "<p><img src=\"file<% .gif\"><p>";
-		startOfChanges = 19;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 3: text update", result);
-		assertTrue("part 3: event type", eventResult);
-
-		eventCase = 38;
-		startString = expectedString;
-		changes = "ab ";
-		expectedString = "<p><img src=\"file<% ab .gif\"><p>";
-		startOfChanges = 20;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 4: text update", result);
-		assertTrue("part 4: event type", eventResult);
-
-		eventCase = 39;
-		startString = expectedString;
-		changes = "%";
-		expectedString = "<p><img src=\"file<% ab %.gif\"><p>";
-		startOfChanges = 23;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 5: text update", result);
-		assertTrue("part 5: event type", eventResult);
-
-		eventCase = 40;
-		startString = expectedString;
-		changes = ">";
-		expectedString = "<p><img src=\"file<% ab %>.gif\"><p>";
-		startOfChanges = 24;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 6: text update", result);
-		assertTrue("part 6: event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void testEmbeddedJSP2()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<a >c</a>";
-		String changes = "<%= b %>";
-		String expectedString = "<a <%= b %>>c</a>";
-		int startOfChanges = 3;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	public void testDeepEmbeddedJSP()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<script><a   >c</a></script>";
-		String changes = "<%= b %>";
-		String expectedString = "<script><a <%= b %>  >c</a></script>";
-		int startOfChanges = 11;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-		IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
-		String testText = testR.getText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %>  >"));
-		testText = testR.getFullText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %>  >"));
-
-		ITextRegionList regionList = testR.getRegions();
-
-		ITextRegion region = regionList.get(0);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<"));
-
-		region = regionList.get(1);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("a"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("a "));
-
-		region = regionList.get(2);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %>"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %>  "));
-
-		// ===	
-
-		ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
-		ITextRegionList eRegions = cRegion.getRegions();
-		ITextRegion eRegion = eRegions.get(0);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-
-		eRegion = eRegions.get(1);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b "));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b "));
-
-		eRegion = eRegions.get(2);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals("%>"));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("%>"));
-
-		eRegion = eRegions.get(3);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals(""));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("  "));
-
-		// ====
-
-		region = regionList.get(3);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals(">"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals(">"));
-
-	}
-
-	public void testDeepEmbeddedJSP2()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<script><a   >c</a></script>";
-		String changes = "<%= b %";
-		String expectedString = "<script><a <%= b %  >c</a></script>";
-		int startOfChanges = 11;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-		IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
-		String testText = testR.getText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %  >"));
-		testText = testR.getFullText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %  >"));
-
-		ITextRegionList regionList = testR.getRegions();
-
-		ITextRegion region = regionList.get(0);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<"));
-
-		region = regionList.get(1);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("a"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("a "));
-
-		region = regionList.get(2);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %  >"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %  >"));
-
-		// ===	
-
-		ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
-		ITextRegionList eRegions = cRegion.getRegions();
-		ITextRegion eRegion = eRegions.get(0);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-
-		eRegion = eRegions.get(1);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b %  >"));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b %  >"));
-
-
-		// ====	
-	}
-
-	public void testDeepEmbeddedJSP3() {
-		// CMVC 245586
-		// this is a test to make sure ContextRegionContainer returns what we expect
-		setUpJSP();
-		String startString = "<html><head><script> <%! String testvar = \"testvar\"; %> var test = <%= testvar %> </script></head></html>";
-		String expectedText = "<%! String testvar = \"testvar\"; %>";
-		((XMLSourceParser) fModel.getParser()).addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false)); //$NON-NLS-1$
-		fModel.setText(null, startString);
-
-		fModel.getRegionList();
-
-		IStructuredDocumentRegion scriptBlockRegion = fModel.getRegionAtCharacterOffset(21);
-		ITextRegionList blockRegions = scriptBlockRegion.getRegions();
-		ITextRegionContainer jspDecl = (ITextRegionContainer) blockRegions.get(1);
-		String fullText = jspDecl.getFullText();
-
-		//assertTrue("ContextRegionContainer.getFullText()", fullText.equals(expectedText));
-		assertEquals("ContextRegionContainer.getFullText() value incorrect: ", expectedText, fullText);
-	}
-
-	public void testJSP1()  {
-
-		setUpJSP();
-		eventCase = 23;
-		String startString = "abcd<%= abc %>efgh";
-		String expectedString = "abcd< %= abc %>efgh";
-		String changes = " ";
-		int startOfChanges = 5;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	public void testJSP2()  {
-
-		setUpJSP();
-		eventCase = 24;
-		String startString = "abcd<% abc %>efgh";
-		String expectedString = "abcd< % abc %>efgh";
-		String changes = " ";
-		int startOfChanges = 5;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	public void testJSP3()  {
-
-		setUpJSP();
-		eventCase = 25;
-		String startString = "<%= abc %>";
-		String expectedString = "< %= abc %>";
-		String changes = " ";
-		int startOfChanges = 1;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	public void testJSP4()  {
-
-		setUpJSP();
-		eventCase = 26;
-		String startString = "<% abc %>";
-		String expectedString = "< % abc %>";
-		String changes = " ";
-		int startOfChanges = 1;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 Give a JSP scriptlet :
-	 <% aaa %>
-	 When an user types "<bb>" just before
-	 the JSP scriptlet :
-	 (1) When '<' is typed, regionsReplaced()
-	 is called for "<%".
-	 (2) When 'b' is typed, nodesReplaced()
-	 is called for "<<%" and " aaa ".
-	 (3) When 'b' is typed again, finally,
-	 nodesReplaced() is called for
-	 "<b<% aaa" and "%>".
-	 The end JSP IStructuredDocumentRegion should be
-	 reparsed at (1), but not wait until (3).
-	 
-	 */
-	public void testJSP5()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
-		String startString = "<% aaa %><p>";
-		String changes = "<";
-		String expectedString = "<<% aaa %><p>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		eventCase = 27;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		assertEquals("part 1: text update", expectedString, resultString);
-		assertTrue("part 1: event type", eventResult);
-
-		// step 2
-		// ? does assertTrue prevent rest from executing if 'false'?
-		// ans: yes
-		eventCase = 28;
-		startString = expectedString;
-		changes = "b";
-		expectedString = "<b<% aaa %><p>";
-		startOfChanges = 1;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		assertEquals("part 2: text update", expectedString, resultString);
-		assertTrue("part 2: event type", eventResult);
-
-		eventCase = 29;
-		startString = expectedString;
-		changes = "b";
-		expectedString = "<bb<% aaa %><p>";
-		startOfChanges = 2;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		assertEquals("part 3: text update", expectedString, resultString);
-		assertTrue("part 3: event type", eventResult);
-
-		eventCase = 30;
-		startString = expectedString;
-		changes = ">";
-		expectedString = "<bb><% aaa %><p>";
-		startOfChanges = 3;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		assertEquals("part 4: text update", expectedString, resultString);
-		assertTrue("part 4: event type", eventResult);
-	}
-
-	/**
-	 Example 4)
-	 
-	 Given two JSP scriptlets :
-	 <% aaa %><% bbb %>
-	 When an user types "<cccc>" just before
-	 the JSP scriptlet, watch the IStructuredDocument events
-	 on each character typing.
-	 You will see the next JSP IStructuredDocumentRegion is reparsed
-	 (to be broken into other type of IStructuredDocumentRegion)
-	 one by one on each event.
-	 But it should be at once at the first event.
-	 Old Component: wsa.web.pageediting
-	 New Component: wsa.web.xmleditor
-	 
-	 
-	 */
-	public void testJSP6()  {
-		// caution ... we're re-using event checks from JSP5
-
-		setUpJSP();
-
-		eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
-		String startString = "<% aaa %><% bbb %>";
-		String changes = "<";
-		String expectedString = "<<% aaa %><% bbb %>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-		eventCase = 31;
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-		assertTrue("part 1: text update", result);
-		assertTrue("part 1: event type", eventResult);
-
-		eventCase = 32;
-		startString = expectedString;
-		changes = "c";
-		expectedString = "<c<% aaa %><% bbb %>";
-		startOfChanges = 1;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 2: text update", result);
-		assertTrue("part 2: event type", eventResult);
-
-		eventCase = 33;
-		startString = expectedString;
-		changes = "c";
-		expectedString = "<cc<% aaa %><% bbb %>";
-		startOfChanges = 2;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 3: text update", result);
-		assertTrue("part 3: event type", eventResult);
-
-		eventCase = 34;
-		startString = expectedString;
-		changes = ">";
-		expectedString = "<cc><% aaa %><% bbb %>";
-		startOfChanges = 3;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 4: text update", result);
-		assertTrue("part 4: event type", eventResult);
-
-	}
-
-	/**
-	 * this test easily returns "ok" even with the no-space bug. Its mostly to
-	 * "hand examine" the structuredDocument created from the initial setText.
-	 */
-	public void testJSPDirective()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-		String startString = "<%@include%>";
-		String changes = "T";
-		String expectedString = "<%@include%>T";
-		int startOfChanges = 12;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//  ?
-		//	assertTrue(result); // && eventResult);
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:53:08 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod10()  {
-
-		setUpXML();
-		eventCase = 10;
-		String expectedString = "<TD></TD>";
-
-		fModel.setText(null, "<TD></TD><TD></TD>");
-
-		fModel.replaceText(null, 9, 9, "");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 10:56:04 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod11()  {
-
-		setUpXML();
-		eventCase = 11;
-		String expectedString = "<XXX><TD></TD><XXX>";
-
-		fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
-		fModel.replaceText(null, 5, 9, "");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 10:59:39 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod12()  {
-
-		setUpXML();
-		eventCase = 12;
-		String expectedString = "<XXX><TD></TD><XXX>";
-
-		fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
-		fModel.replaceText(null, 14, 9, "");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:00:59 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod13()  {
-
-		setUpXML();
-		eventCase = 13;
-		String expectedString = "<ABC><JKL><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 5, 5, "<JKL>");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:02:19 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod14()  {
-
-		setUpXML();
-		eventCase = 14;
-		String expectedString = "<a>\r\r  </a>";
-
-		fModel.setText(null, "<a>\r<b>\r  </a>");
-
-		fModel.replaceText(null, 4, 3, "");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:03:53 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod15()  {
-
-		setUpXML();
-		eventCase = 15;
-		String expectedString = "<a><b ></b></a>";
-
-		fModel.setText(null, "<a><b></b></a>");
-
-		fModel.replaceText(null, 5, 0, " ");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:05:27 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod16()  {
-
-		setUpXML();
-		eventCase = 16;
-		String expectedString = "<a><b z></b></a>";
-
-		fModel.setText(null, "<a><b ></b></a>");
-
-		fModel.replaceText(null, 6, 0, "z");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:06:33 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod17()  {
-
-		setUpXML();
-		eventCase = 17;
-		String expectedString = "<a><b z=\"t\"></b></a>";
-
-		fModel.setText(null, "<a><b z></b></a>");
-
-		fModel.replaceText(null, 6, 1, "z=\"t\"");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:09:17 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod18()  {
-
-		setUpXML();
-		eventCase = 18;
-		String expectedString = "<a><c z></b></a>";
-
-		fModel.setText(null, "<a><b z></b></a>");
-
-		fModel.replaceText(null, 4, 3, "c z");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:10:30 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod19()  {
-
-		eventCase = 19;
-		setUpJSP();
-		fModel.setText(null, "<BODY>\r<IMG src=\"<%=\r</BODY>\r");
-		String expectedString = "<BODY>\r<IMG src=\"<%=Q\r</BODY>\r";
-
-		fModel.replaceText(null, 20, 0, "Q");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:12:05 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod20()  {
-
-		setUpJSP();
-
-		eventCase = 20;
-		String expectedString = "<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
-		fModel.setText(null, "<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
-		fModel.replaceText(null, 28, 1, "\rBODY {\r\r}");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:32:23 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod21()  {
-
-		setUpJSP();
-
-		eventCase = 21;
-		String expectedString = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r      <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
-		fModel.setText(null, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r      <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
-		fModel.replaceText(null, 343, 1, "\rBODY {\r\r}");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:45:29 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod9()  {
-
-		setUpXML();
-		eventCase = 9;
-		String expectedString = "<TD></TD>";
-
-		fModel.setText(null, "<TD></TD><TD></TD>");
-
-		fModel.replaceText(null, 0, 9, "");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:45:29 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethodAttributeNameReplace1()  {
-
-		//testEvent = 22;
-		//tags = "<tagName abc=\"bsf\">";
-		//testStructuredDocumentReplacement(testEvent, tags, "abcde","<tagName abcde=\"bsf\">", 9, 3);
-
-		setUpXML();
-		eventCase = 22;
-		String startString = "<tagName abc=\"bsf\">";
-		String expectedString = "<tagName abcde=\"bsf\">";
-		String changes = "abcde";
-		int startOfChanges = 9;
-		int lengthToReplace = 3;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:35:41 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testModifyMiddle()  {
-
-		setUpXML();
-		eventCase = 5;
-		String expectedString = "<ABC><JKL><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 0, 15, "<ABC><JKL><GHI>");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:06:33 PM)
-	 */
-	public void testNoChange1()  {
-
-		setUpXML();
-		eventCase = 1;
-		String expectedString = "<ABC><DEF><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 10, 0, "");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:26:05 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testNoChange2()  {
-
-		setUpXML();
-		eventCase = 2;
-		String expectedString = "<ABC><DEF><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 0, 15, "<ABC><DEF><GHI>");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:38:25 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testSimilarStart()  {
-
-		setUpXML();
-		eventCase = 6;
-		String expectedString = "<P><B></B><B></B></P>";
-
-		fModel.setText(null, "<P><B></B></P>");
-
-		fModel.replaceText(null, 3, 0, "<B></B>");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:43:29 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testSimilarStartEnd()  {
-
-		setUpXML();
-		eventCase = 8;
-		String expectedString = "<P><B><B></B></B></P>";
-
-		fModel.setText(null, "<P><B></B></P>");
-
-		fModel.replaceText(null, 6, 0, "<B></B>");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:41:46 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testSimiliarEnd()  {
-
-		setUpXML();
-		eventCase = 7;
-		String expectedString = "<P><B></B><P><P>";
-
-		fModel.setText(null, "<P><B></B><P>");
-
-		fModel.replaceText(null, 10, 0, "<P>");
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 */
-	public void testTagReDetection()  {
-
-		setUpJSP();
-		// (nsd) 2003.12.10 - changed from NodesReplaced to RegionsReplaced since the start condition was changed
-		// from being 3 document regions to 4 since "script" is not 'nestable'
-		//eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		
-		// reverted 2004.04.05
-		eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-//		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<p>test<<SCRIPT>";
-		String changes = "S";
-		String expectedString = "<p>test<S<SCRIPT>";
-		int startOfChanges = 8;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void testTagReDetection2()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGION_CHANGED_EVENT_CASE;
-		String startString = "<p>test<<SCRIPT>";
-		String changes = "S";
-		String expectedString = "<p>test<<SCRIPTS>";
-		int startOfChanges = 15;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void testTagReDetection3()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-		String startString = "<p>test<test>";
-		String changes = "%";
-		String expectedString = "<p>test<%test>";
-		int startOfChanges = 8;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		assertEquals(expectedString, resultString);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (fModel != null)
-			fModel.removeDocumentChangedListener(proxy);
-	}
-
-	/**
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	public void testPageDirective()  {
-		boolean verbose = false;
-		setUpJSP();
-		eventCase = 999; //GENERIC_NODES_REPLACED_EVENT_CASE;
-		String startString = "<%@page lang=\"java\" <SCRIPT>var <% test %> String</SCRIPT>";
-		String changes = "s";
-		String expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
-		int startOfChanges = 18;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		if (verbose) {
-			Debug.dump(fModel, true);
-		}
-
-		StructuredDocumentEvent structuredDocumentEvent = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		//assertTrue("event type", eventResult);
-
-		if (verbose) {
-			System.out.println();
-			System.out.println("structured document:");
-			IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
-			Debug.dump(document, true);
-		}
-
-		// now delete quote
-		changes = "";
-		expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
-		startOfChanges = 19;
-		lengthToReplace = 1;
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-		assertTrue("text update", result);
-
-		if (verbose) {
-			System.out.println();
-			System.out.println("structured document:");
-			IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
-			Debug.dump(document, true);
-		}
-
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
deleted file mode 100644
index 04166995a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
+++ /dev/null
@@ -1,204 +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.ui.tests.pagedirective;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Node;
-
-/**
- * @author davidw
- */
-public class TestPageDirective extends TestCase {
-
-	class MyEmbeddedFactory implements INodeAdapterFactory {
-
-		public INodeAdapter adapt(INodeNotifier object) {
-			return null;
-		}
-
-		public INodeAdapterFactory copy() {
-			return null;
-		}
-
-		public boolean isFactoryForType(Object type) {
-			return type instanceof MyAdaptedClass;
-		}
-
-		public void release() {
-			// noop
-		}
-	}
-	
-	class MyAdaptedClass {
-		// dummy class is key
-	}
-	
-	/**
-	 * Constructor for TestPageDirective.
-	 * @param name
-	 */
-	public TestPageDirective(String name) {
-		super(name);
-	}
-
-	public void testBasicPD() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
-		String contentType = pageDirectiveAdapter.getContentType();
-		String language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be java", "java".equals(language));
-
-	}
-
-	public void testBasicChangedPD() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
-		String contentType = pageDirectiveAdapter.getContentType();
-		String language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be java", "java".equals(language));
-
-		// change to javascript
-		model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
-		contentType = pageDirectiveAdapter.getContentType();
-		language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be javascript", "javascript".equals(language));
-
-	}
-
-	public void testBasicChangedPDBack() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
-		String contentType = pageDirectiveAdapter.getContentType();
-		String language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be java", "java".equals(language));
-
-		// change to javascript
-		model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
-		contentType = pageDirectiveAdapter.getContentType();
-		language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be javascript", "javascript".equals(language));
-
-		// change back to java
-		model.getStructuredDocument().replaceText(this, 43, 10, "java");
-
-		contentType = pageDirectiveAdapter.getContentType();
-		language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertEquals("java", language);
-	}
-	
-	public void testSetEmbeddedType(){
-		IStructuredModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		EmbeddedTypeHandler embeddedXMLHandler = new EmbeddedXML();
-		pageDirectiveAdapter.setEmbeddedType(embeddedXMLHandler);
-		
-		EmbeddedTypeHandler handler = pageDirectiveAdapter.getEmbeddedType();
-		assertTrue("incorrect embedded handler", handler == embeddedXMLHandler);
-	}
-	
-	public void testAdapt() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		Node ownerNode = model.getDocument();
-		
-		ModelQueryAdapter embeddedAdapter = (ModelQueryAdapter) pageDirectiveAdapter.adapt((INodeNotifier) ownerNode, ModelQueryAdapter.class);
-		assertNotNull("could not adapt embedded adapter", embeddedAdapter);
-	}
-	
-	public void testAddEmbeddedFactory() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		pageDirectiveAdapter.addEmbeddedFactory(new MyEmbeddedFactory());
-	}
-	
-	public void testSetLanguage() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		pageDirectiveAdapter.setLanguage("text/xml");
-		assertTrue("set language failed", pageDirectiveAdapter.getLanguage().equals("text/xml"));
-	}
-	
-	public void testGetTarget() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		INodeNotifier notifier = pageDirectiveAdapter.getTarget();
-		assertNotNull("target is null", notifier);
-	}
-	
-	public void testRelease() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		pageDirectiveAdapter.release();
-		// considered "success" if doesn't through exception
-		assertTrue(true);
-	}
-	
-	private IDOMModel createUnmanagedHTMLModel() {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		return (IDOMModel)model;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
deleted file mode 100644
index 43ff06235..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
+++ /dev/null
@@ -1,305 +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.ui.tests.partitioning;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-import com.ibm.icu.text.DecimalFormat;
-
-public class TestStructuredPartitionerJSP extends TestCase {
-
-	private boolean DEBUG_PRINT_RESULT = false;
-	protected ITypedRegion[] partitions = null;
-
-	private boolean useFormatter = true;
-	protected DecimalFormat formatter;
-
-	public TestStructuredPartitionerJSP(String name) {
-		super(name);
-		if (DEBUG_PRINT_RESULT && useFormatter)
-			formatter = new DecimalFormat();
-	}
-	
-	public void testJSP1() throws IOException, BadLocationException { // DW 05/01/2003 I modified this test, after creating test6, 
-		// and changing partioner to pick up end *> as part of page directive
-		// partition (for highlighting to work right).
-		int expectedPartitions = 10;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example01.jsp");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_DEFAULT, IHTMLPartitions.HTML_DEFAULT});
-	}
-
-	public void testJSP2() throws IOException, BadLocationException {
-		int expectedPartitions = 13;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example02.jsp");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.HTML_COMMENT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_DEFAULT, IHTMLPartitions.HTML_DEFAULT});
-	}
-
-	public void testJSP3() throws IOException, BadLocationException {
-		int expectedPartitions = 5;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example03.jsp");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, ICSSPartitions.STYLE, IHTMLPartitions.HTML_DEFAULT,});
-	}
-
-	public void testJSP4() throws IOException, BadLocationException {
-		int expectedPartitions = 8;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example04.jsp");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, "org.eclipse.wst.html.SCRIPT.language.MYLANGUAGE", IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_COMMENT, IHTMLPartitions.HTML_DEFAULT});
-	}
-
-	public void testJSP5() throws IOException, BadLocationException {
-		int expectedPartitions = 17;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example05.jsp");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_COMMENT, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT});
-	}
-
-	public void testJSP6() throws IOException, BadLocationException {
-		int expectedPartitions = 1;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example06.jsp");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE});
-	}
-
-	public void testBug131463() throws IOException, BadLocationException {
-		int expectedPartitions = 13;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/bug131463.jsp");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IXMLPartitions.XML_CDATA, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_DIRECTIVE, IJSPPartitions.JSP_CONTENT_JAVA, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_JAVA, IHTMLPartitions.HTML_DEFAULT, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_DIRECTIVE});
-	}
-
-	public void testPerfJSP() throws IOException, BadLocationException {
-		//int expectedPartitions = 6;
-		//XXX FIXME! 
-		//nt nPartitions = 
-			doTimedComputePartitioningTest("testfiles/jsp/company300k.jsp");
-		//assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		//checkSeams();
-		//verifyPartitionTypes(partitions, new String[]{IXMLPartitions.ST_XML_PI, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_DECLARATION, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_COMMENT, IXMLPartitions.ST_DEFAULT_XML});
-	}
-
-	public void testEmpty() throws IOException, BadLocationException {
-		int expectedPartitions = 1;
-		int nPartitions = doComputePartitioningTest("testfiles/xml/empty.xml");
-		assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
-	}
-
-	/**
-	 * Ensure that the current list of partitions are all adjacent to one
-	 * another
-	 */
-	protected void checkSeams() {
-		if (partitions == null)
-			return;
-		int offset = 0;
-		for (int i = 0; i < partitions.length; i++) {
-			assertEquals("partitions are not contiguous!", partitions[i].getOffset(), offset);
-			offset = partitions[i].getOffset() + partitions[i].getLength();
-		}
-	}
-
-	/**
-	 * Compute the partitions for the given filename using the default
-	 * partitioner for that file type.
-	 * 
-	 * @param filename
-	 * @return int
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		if (inStream == null)
-			inStream = new StringBufferInputStream("");
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (DEBUG_PRINT_RESULT && useFormatter) {
-			double baseTen = Math.log(10);
-			formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
-			formatter.setGroupingUsed(false);
-		}
-
-		partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
-		if (DEBUG_PRINT_RESULT) {
-			String contents = null;
-
-			System.out.println("\nfilename: " + filename);
-			for (int i = 0; i < partitions.length; i++) {
-				try {
-					contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
-				}
-				catch (BadLocationException e) {
-					contents = "*error*";
-				}
-				if (useFormatter)
-					System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
-				else
-					System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
-			}
-		}
-		checkSeams();
-		model.releaseFromEdit();
-		inStream.close();
-
-		if (partitions == null)
-			return -1;
-		return partitions.length;
-	}
-
-	/**
-	 * Compute the partitions for the given filename using the default
-	 * partitioner for that file type.
-	 * 
-	 * @param filename
-	 * @return int
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected int doTimedComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		if (inStream == null)
-			inStream = new StringBufferInputStream("");
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (DEBUG_PRINT_RESULT && useFormatter) {
-			double baseTen = Math.log(10);
-			formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
-			formatter.setGroupingUsed(false);
-		}
-		long startTime = System.currentTimeMillis();
-		partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
-		long endTime = System.currentTimeMillis();
-		if (DEBUG_PRINT_RESULT) {
-
-			String contents = null;
-
-			System.out.println("\nfilename: " + filename);
-			System.out.println("Time to compute " + partitions.length + ": " + (endTime - startTime) + " (msecs)");
-			for (int i = 0; i < partitions.length; i++) {
-				try {
-					contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
-				}
-				catch (BadLocationException e) {
-					contents = "*error*";
-				}
-				if (useFormatter)
-					System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
-				else
-					System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
-			}
-		}
-		checkSeams();
-		model.releaseFromEdit();
-		inStream.close();
-
-		if (partitions == null)
-			return -1;
-		return partitions.length;
-	}
-
-	/**
-	 * Retrieves the single partition at the given offset for the given file,
-	 * using the default partitioner for that file type. This test allows for
-	 * verifying the zero-length partitioning behavior.
-	 * 
-	 * @param filename
-	 * @param offset
-	 * @return ITypedRegion
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-		partitions = null;
-		ITypedRegion partition = structuredDocument.getPartition(offset);
-		if (DEBUG_PRINT_RESULT) {
-			String contents = null;
-
-			System.out.println("\nfilename: " + filename);
-			try {
-				contents = structuredDocument.get(partition.getOffset(), partition.getLength());
-			}
-			catch (BadLocationException e) {
-				contents = "*error*";
-			}
-			System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
-		}
-		model.releaseFromEdit();
-		inStream.close();
-
-		return partition;
-	}
-
-	/**
-	 * Verifies that the given partitions are of the given partition types
-	 * 
-	 * @param typedRegions
-	 * @param types
-	 */
-	protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
-		for (int i = 0; i < expectedTypes.length; i++)
-			assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
-	}
-
-	/**
-	 * Verifies that the given partitions begin at the given offsets
-	 * 
-	 * @param typedRegions
-	 * @param types
-	 */
-	protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
-		for (int i = 0; i < offsets.length; i++) {
-			assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
-			if (i > 0) {
-				assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
-			}
-		}
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/bug131463.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/bug131463.jsp
deleted file mode 100644
index 717219680..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/bug131463.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<jsp:text>
-	<![CDATA[ <?xml version="1.0" encoding="ISO-8859-1" ?> ]]>
-</jsp:text>
-<jsp:scriptlet>
-	<![CDATA[
-		String test = "something";
-	]]>
-</jsp:scriptlet>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
deleted file mode 100644
index cadf5e7fe..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
+++ /dev/null
@@ -1,8099 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>The Ultimate A Company</title>
-	</head>
-	<body>
-		<p>
-			<img src="../banner.gif" height="51" width="659" alt="" />
-		</p>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<p>
-			<img src="../footer.gif" height="25" width="659" alt="" />
-		</p>
-	</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp
deleted file mode 100644
index cc7c54d9e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html" %>
-<jsp:directive.page contentType=text/html" />
-<HTML id="<% java code "string" section %>">
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp
deleted file mode 100644
index a6d0ec915..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-       <p>
-       <% testing "123" test test;
-       // test
-       one two three
-       %>
-       <!-- 78 -->
-       <table id = "<% test %>" attrib=junk>
-       </BODY>
-       </HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp
deleted file mode 100644
index 8ffd3101b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<HTML>
-<SCRIPT>
-java script section
-</SCRIPT>
-<STYLE>
-   style section
-   </STYLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp
deleted file mode 100644
index 6808704a3..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<script language="MyLanguage"><%= "A" %>      
- </SCRIPT>
-<%-- --%>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp
deleted file mode 100644
index a6151d3a9..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<formatting>
-<script type="text/javascript">
-//	Copyright 2000,2001 by www.example.com
-  document.URL ="a";
-</script>
-
-<% String a = "a"; %>
-<%-- test comment --%>
-<%= 
-
-"   aaaaa "
-
-%>
-<%! %>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp
deleted file mode 100644
index 85173f4d2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@page language="javascript" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java
deleted file mode 100644
index 425536792..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java
+++ /dev/null
@@ -1,130 +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.ui.tests.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-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.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * @author pavery
- */
-public class AdapterFactoryRegistryTest extends TestCase {
-
-	private final String CLASSNAME_HTML_FACTORY = "org.eclipse.wst.html.ui.internal.registry.AdapterFactoryProviderForHTML";
-	private final String CLASSNAME_DTD_FACTORY = "org.eclipse.wst.dtd.ui.internal.registry.AdapterFactoryProviderForDTD";
-	private final String CLASSNAME_JSP_FACTORY = "org.eclipse.jst.jsp.ui.internal.registry.AdapterFactoryProviderForJSP";
-	private final String CLASSNAME_CSS_FACTORY = "org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS";
-	private final String CLASSNAME_XML_FACTORY = "org.eclipse.wst.xml.ui.internal.registry.AdapterFactoryProviderForXML";
-
-
-	public void testCreate() {
-		AdapterFactoryRegistry instance = AdapterFactoryRegistryImpl.getInstance();
-		assertNotNull(instance);
-	}
-
-	public void testGetAllFactories() {
-		AdapterFactoryRegistry instance = AdapterFactoryRegistryImpl.getInstance();
-		Iterator it = instance.getAdapterFactories();
-		Object provider = null;
-
-		// all providers expected classnames added here
-		List known = new ArrayList();
-		known.add(CLASSNAME_HTML_FACTORY);
-		known.add(CLASSNAME_DTD_FACTORY);
-		known.add(CLASSNAME_JSP_FACTORY);
-		known.add(CLASSNAME_CSS_FACTORY);
-		known.add(CLASSNAME_XML_FACTORY);
-
-		while (it.hasNext()) {
-			provider = it.next();
-			known.remove(provider.getClass().getName());
-			// System.out.println(provider.getClass().getName());
-		}
-
-		// should have encountered all expected adapter factories.
-		assertEquals("unknown (extra) adapter factories found", 0, known.size());
-	}
-
-	public void testGetFactoriesXML() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_XML_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForXML.ContentTypeID_XML, CLASSNAME_HTML_FACTORY);
-	}
-
-	public void testGetFactoriesHTML() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_JSP_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForJSP.ContentTypeID_JSP, CLASSNAME_XML_FACTORY);
-	}
-
-	public void testGetFactoriesJSP() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_HTML_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForHTML.ContentTypeID_HTML, CLASSNAME_DTD_FACTORY);
-	}
-
-	public void testGetFactoriesDTD() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_DTD_FACTORY);
-
-		getFactoriesForContentType(known, "org.eclipse.wst.dtd.core.dtdsource", CLASSNAME_HTML_FACTORY);
-	}
-
-	public void testGetFactoriesCSS() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_CSS_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForCSS.ContentTypeID_CSS, CLASSNAME_JSP_FACTORY);
-	}
-
-	/**
-	 * Compare to a expected list of AdapterFactoryProviders (may be smaller
-	 * than the actual list) for a given contentTypeId. At minimum these
-	 * expected providers must be found to pass.
-	 * 
-	 * @param expected
-	 * @param contentTypeId
-	 */
-	private void getFactoriesForContentType(List expected, String contentTypeId, String notExpectedClassname) {
-
-		AdapterFactoryRegistryImpl instance = (AdapterFactoryRegistryImpl) AdapterFactoryRegistryImpl.getInstance();
-		Iterator it = instance.getAdapterFactories(contentTypeId);
-		Object provider = null;
-		while (it.hasNext()) {
-			provider = it.next();
-			expected.remove(provider.getClass().getName());
-
-			// System.out.println("encountered provider: " +
-			// provider.getClass().getName());
-			assertTrue("!provider: " + notExpectedClassname + " shouldn't be in the list!", !notExpectedClassname.equals(provider.getClass().getName()));
-		}
-		// we should have at least found the expected factory (or factories)
-		assertTrue("extra providers (expected none): " + expected, expected.isEmpty());
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
deleted file mode 100644
index 2e4083d34..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
+++ /dev/null
@@ -1,251 +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.ui.tests.search;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchDocument;
-import org.eclipse.jdt.core.search.SearchPattern;
-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.java.search.JSPSearchScope;
-import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchSupport;
-import org.eclipse.jst.jsp.ui.internal.java.search.BasicJSPSearchRequestor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-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.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-/**
- * Tests for JSPSearchSupport
- * @author pavery
- */
-public class JSPSearchTests extends TestCase implements IJavaSearchConstants {
-
-	/**
-	 * to accept search matches
-	 * addCheckMatch(...) for matches you expect, run search support, checkValid() to see if all expected got hit
-	 */
-	class TestJspSearchRequestor extends BasicJSPSearchRequestor {
-
-		private List matches = null;
-
-		public TestJspSearchRequestor() {
-			this.matches = new ArrayList();
-		}
-
-		// called by search framework
-		protected void addSearchMatch(IStructuredDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-			this.matches.remove(new TestSearchMatch(jspFile.getName(), jspStart, jspEnd));
-		}
-
-		public void beginReporting() {
-			// do nothing since we have no UI, don't access ISearchResultView
-		}
-
-		public void endReporting() {
-			// do nothing since we have no UI, don't access ISearchResultView
-		}
-
-		public void addCheckMatch(String filename, int jspStart, int jspEnd) {
-			this.matches.add(new TestSearchMatch(filename, jspStart, jspEnd));
-		}
-
-		public boolean checkValid() {
-			return this.matches.isEmpty();
-		}
-
-		public void clear() {
-			this.matches.clear();
-		}
-	}
-
-	/**
-	 * to validate search matches (checkMatch matches a search hit)
-	 */
-	class TestSearchMatch {
-
-		public String filename = null;
-		public int jspStart = -1;
-		public int jspEnd = -1;
-
-		public TestSearchMatch(String filename, int jspStart, int jspEnd) {
-			this.filename = filename;
-			this.jspStart = jspStart;
-			this.jspEnd = jspEnd;
-		}
-
-		public boolean equals(Object obj) {
-			if (!(obj instanceof TestSearchMatch))
-				return false;
-
-			TestSearchMatch possible = (TestSearchMatch) obj;
-			return this.filename.equalsIgnoreCase(possible.filename) && this.jspStart == possible.jspStart && this.jspEnd == possible.jspEnd;
-		}
-	}
-
-	private ProjectUnzipUtility projUtil = null;
-	private boolean isSetup = false;
-
-	public JSPSearchTests() {
-		super("JSP Search Tests");
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (!this.isSetup) {
-			doSetup();
-			this.isSetup = true;
-		}
-	}
-
-	private void doSetup() throws Exception {
-
-		this.projUtil = new ProjectUnzipUtility();
-
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-
-		File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "jspsearch_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-		this.projUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
-		this.projUtil.initJavaProject("judo");
-
-		//JSPSearchSupport.getInstance().indexWorkspaceAndWait();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		// do nothing
-	}
-
-	public void testIndexWorkspace() {
-		JSPSearchSupport support = JSPSearchSupport.getInstance();
-		SearchDocument doc = JSPSearchSupport.getInstance().getSearchDocument("/judo/searchTestJSP.java");
-		assertNotNull("couldn't retrieve:'/judo/searchTestJSP.java'", doc);
-
-		doc = support.getSearchDocument("/judo/searchTestJSP2.java");
-		assertNotNull("couldn't retrieve:'/judo/searchTestJSP2.java'", doc);
-
-		doc = support.getSearchDocument("/judo/searchTestJSP3.java");
-		assertNotNull("couldn't retrieve:'/judo/searchTestJSP3.java'", doc);
-	}
-
-	public void testSearchField() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP.jsp", 93, 106);
-		JSPSearchSupport.getInstance().search("searchForThis", new JSPSearchScope(), FIELD, ALL_OCCURRENCES, SearchPattern.R_EXACT_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: searchForThis", requestor.checkValid());
-	}
-
-	public void testSearchMethod() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP.jsp", 143, 158);
-		requestor.addCheckMatch("searchTestJSP.jsp", 298, 315);
-		JSPSearchSupport.getInstance().search("searchForMethod", new JSPSearchScope(), METHOD, ALL_OCCURRENCES, SearchPattern.R_EXACT_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: searchForMethod", requestor.checkValid());
-	}
-
-	public void testSearchPatternMatch() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP.jsp", 93, 106);
-		requestor.addCheckMatch("searchTestJSP2.jsp", 116, 129);
-		requestor.addCheckMatch("searchTestJSP2.jsp", 152, 165);
-		JSPSearchSupport.getInstance().search("search*", new JSPSearchScope(), FIELD, ALL_OCCURRENCES, SearchPattern.R_PATTERN_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: search*", requestor.checkValid());
-	}
-
-	public void testSearchProjectClasses() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP3.jsp", 148, 157);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 170, 179);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 263, 273);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 299, 309);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 408, 417);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 430, 439);
-		JSPSearchSupport.getInstance().search("Jellybean*", new JSPSearchScope(), TYPE, ALL_OCCURRENCES, SearchPattern.R_PATTERN_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: search*", requestor.checkValid());
-	}
-
-	public void testSearchLocalVariable() {
-
-		IDOMModel xmlModel = null;
-		try {
-			IPath jspTestFilePath = new Path("judo/SEARCH/searchTestJSP3.jsp");
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-			xmlModel = (IDOMModel) getStructuredModelForRead(file);
-			setupAdapterFactory(xmlModel);
-
-			IDOMDocument doc = xmlModel.getDocument();
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) doc.getAdapterFor(IJSPTranslation.class);
-			JSPTranslation translation = adapter.getJSPTranslation();
-			IJavaElement element = translation.getElementsFromJspRange(377, 384)[0];
-
-			TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-			requestor.addCheckMatch("searchTestJSP3.jsp", 377, 384);
-			JSPSearchSupport.getInstance().search(element, new JSPSearchScope(), requestor);
-			assertTrue("did not find all expected matches: search*", requestor.checkValid());
-		}
-		finally {
-			if (xmlModel != null)
-				xmlModel.releaseFromRead();
-		}
-	}
-
-	private IStructuredModel getStructuredModelForRead(IFile file) {
-
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			return modelManager.getModelForRead(file);
-		}
-		catch (IOException ioex) {
-			System.out.println("couldn't open file:" + file);
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * add the factory for JSPTranslationAdapter here
-	 * @param sm
-	 */
-	private void setupAdapterFactory(IStructuredModel sm) {
-
-		JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
-		sm.getFactoryRegistry().addFactory(factory);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java
deleted file mode 100644
index 22b6b201e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java
+++ /dev/null
@@ -1,303 +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.ui.tests.threaded;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Created for: https://bugs.eclipse.org/bugs/show_bug.cgi?id=116523
- */
-public class ThreadedModelReadEditTest extends TestCase {
-
-	private final String PROJECT_NAME = "PROJECT_116523";
-	private static boolean isSetup = false;
-	
-	private class TranslateJob extends Job {
-		String fFilePath = null;
-		public TranslateJob(String filename, String jobname) {
-			super(jobname);
-			fFilePath = filename;
-		}
-		protected IStatus run(IProgressMonitor monitor) {
-			IFile f = getOrCreateFile(fFilePath);
-			JSPTranslator trans = new JSPTranslator();
-			IStructuredModel sModel = null;
-			try {
-				sModel = StructuredModelManager.getModelManager().getModelForRead(f);
-				if(sModel != null) {
-					trans.reset((IDOMNode)sModel.getIndexedRegion(0), new NullProgressMonitor());
-					trans.translate();
-				}
-				
-			}
-			catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			finally {
-				if(sModel != null)
-					sModel.releaseFromRead();
-			}
-			
-			return Status.OK_STATUS;
-		}
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		if(!isSetup) {
-			doSetup();
-			isSetup = true;
-		}
-	}
-	
-	private void doSetup() {
-		createProject();
-	}
-	/*
-	 * create 100 test files
-	 * repeat doTest() on those 100 files 5x
-	 */
-//	public void test_116523() {
-//
-//		// try and do some concurrent editing/indexing
-//		for(int j=0; j<5; j++) {
-//			for(int i=0; i<100; i++) 
-//				doTest("test_" + i + ".jsp");
-//		}
-//	}
-//	/*
-//	 * doTest() on same file 100x
-//	 */
-//	public void test_116523_2() {
-//
-//		// try and do some concurrent editing/indexing
-//		for(int i=0; i<100; i++) 
-//			doTest("test_1.jsp");
-//	}
-	
-	/*
-	 * doTest() (insert text & edit dom)
-	 * and force JSPTranslation on another thread
-	 * 
-	 * repeat lots of times
-	 */
-	public void test_116523_3() {
-		String filename = "t_test_1.jsp";
-		
-		getOrCreateFile(PROJECT_NAME + "/" + filename);
-		
-		for(int j=0; j<100; j++) {
-			TranslateJob translateJob = new TranslateJob(PROJECT_NAME + "/" + filename, "JSP Translate Job");
-			translateJob.schedule();
-			performEdits(filename);
-		}
-	}
-	
-	private void performEdits(String filePath) {
-		
-		IFile blankJspFile = getOrCreateFile(PROJECT_NAME + "/" + filePath);
-		
-		// document edit
-		iDocumentInsert(blankJspFile,  "<logic:iterate id=\"iterateID\" type=\"java.util.List\" indexId=\"indexID\"></logic:iterate>\n",0);
-		
-		// dom edit
-		HashMap attrs = new HashMap();
-		attrs.put("uri", "struts-logic.tld");
-		attrs.put("prefix", "logic");
-		domInsertElement(blankJspFile, "jsp:directive.taglib", attrs, 0);
-	}
-	
-	protected IFile getOrCreateFile(String filePath) {
-		IFile blankJspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-		if (blankJspFile != null && !blankJspFile.exists()) {
-			try {
-				blankJspFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		return blankJspFile;
-	}
-
-	public void domInsertElement(IFile file, String tagName, HashMap attributes, int insertionPoint) {
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getModelForEdit(file);
-			if(sModel != null) {
-				Document domDoc = (Document)sModel.getAdapter(Document.class );
-				IndexedRegion r = sModel.getIndexedRegion(insertionPoint);
-				if(r instanceof Node) {
-					Element e = domDoc.createElement(tagName);
-					Iterator iter = attributes.keySet().iterator();
-					// set attributes
-					while (iter.hasNext()) {
-						String attr = (String) iter.next();
-						String val =  (String)attributes.get(attr);
-						
-						Attr attrNode = domDoc.createAttribute(attr);
-						attrNode.setValue(val);
-						e.setAttributeNode(attrNode);
-					}
-					domDoc.insertBefore(e, (Node)r);
-					domDoc.insertBefore(domDoc.createTextNode("\n"), (Node)r);
-				}
-				sModel.save();
-			}
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		finally {
-			if(sModel != null)
-				sModel.releaseFromEdit();
-		}	
-		// System.out.println("inserted element, dom style");
-	}
-	
-	public void iDocumentInsert(IFile file, String text, int insertionPoint) {
-		
-		// get the file's text buffer
-		ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-		IPath path = file.getFullPath();
-		try {
-			bufferManager.connect(path, null);
-
-			IDocument doc = null;
-
-			ITextFileBuffer buff = bufferManager.getTextFileBuffer(file.getFullPath());
-			doc = buff.getDocument();
-
-			boolean saveWhenDone = !buff.isDirty();
-
-			InsertEdit insertEdit = new InsertEdit(insertionPoint, text);
-			insertEdit.apply(doc);
-
-			// if the document was not previously dirty, save it
-			if (saveWhenDone)
-				buff.commit(null, false);
-		}
-		catch (BadLocationException e) {
-			e.printStackTrace();
-		}		
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		finally {
-			try {
-				bufferManager.disconnect(path, null);
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		// System.out.println("inserted text, file buffer style");
-	}
-
-//	private void structuredDocInsert(String filePath) {
-//		// PROJECT_NAME + "/blank.jsp"
-//		IFile blankJspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-//		if (blankJspFile != null) {
-//			try {
-//				blankJspFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
-//			}
-//			catch (CoreException e) {
-//				e.printStackTrace();
-//			}
-//		}
-//
-//		IStructuredModel sModel = null;
-//		try {
-//			sModel = StructuredModelManager.getModelManager().getModelForEdit(blankJspFile);
-//			if (sModel != null) {
-//				IStructuredDocument sDoc = sModel.getStructuredDocument();
-//
-//				String insertText1 = "<logic:iterate id=\"iterateID\" type=\"java.util.List\" indexId=\"indexID\"></logic:iterate>\n";
-//				String insertText2 = "<%@taglib uri=\"struts-logic.tld\" prefix=\"logic\" %>\n";
-//
-//				sDoc.replace(0, 0, insertText1);
-//				sDoc.replace(0, 0, insertText2);
-//
-//				JSPSearchSupport.getInstance().addJspFile(blankJspFile);
-//			}
-//		}
-//		catch (IOException e) {
-//			e.printStackTrace();
-//		}
-//		catch (CoreException e) {
-//			e.printStackTrace();
-//		}
-//		catch (BadLocationException e) {
-//			e.printStackTrace();
-//		}
-//		finally {
-//			if (sModel != null)
-//				sModel.releaseFromEdit();
-//		}
-//	}
-
-	private void createProject() {
-
-		// create project
-		String[] natureIds = {ProjectUtil.JAVA_NATURE_ID};
-		IProject proj = ProjectUtil.createProject(PROJECT_NAME, null, natureIds);
-
-		// copy files into workspace
-		IFile f = ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/116523/struts.jar", PROJECT_NAME + "/struts.jar");
-		assertTrue(f.exists());
-		f = ProjectUtil.copyBundleEntryIntoWorkspace("/testfiles/116523/struts-logic.tld", PROJECT_NAME + "/struts-logic.tld");
-		assertTrue(f.exists());
-
-		// add struts to classpath
-		ProjectUtil.addLibraryEntry(proj, "struts.jar");
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java
deleted file mode 100644
index 8e270ff76..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.w3c.dom.Document;
-
-/**
- */
-public class CommonXML {
-
-	public synchronized static DocumentBuilder getDocumentBuilder() {
-		DocumentBuilder result = null;
-		try {
-			result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		return result;
-	}
-
-	public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
-		DocumentBuilder result = null;
-		try {
-			DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
-			instance.setValidating(validating);
-			result = instance.newDocumentBuilder();
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		return result;
-	}
-
-	public static void serialize(Document document, OutputStream ostream) throws IOException {
-		Source domSource = new DOMSource(document);
-		try {
-			Transformer serializer = TransformerFactory.newInstance().newTransformer();
-			try {
-				serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-				serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-				serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
-			}
-			catch (IllegalArgumentException e) {
-				// unsupported properties
-			}
-			serializer.transform(domSource, new StreamResult(ostream));
-		}
-		catch (TransformerConfigurationException e) {
-			throw new IOException(e.getMessage());
-		}
-		catch (TransformerFactoryConfigurationError e) {
-			throw new IOException(e.getMessage());
-		}
-		catch (TransformerException e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java
deleted file mode 100644
index 6b232b22d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java
+++ /dev/null
@@ -1,47 +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.ui.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
-	/**
-	 * Constructor for AllTests.
-	 * @param name
-	 */
-	private static String now = null;
-
-
-	public static String now() {
-		// just calculate once, so whole run as same timestamp
-		if (DateUtil.now == null) {
-			DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-			Calendar calendar = Calendar.getInstance();
-			Date today = calendar.getTime();
-			DateUtil.now = format.format(today);
-		}
-		return DateUtil.now;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
deleted file mode 100644
index 8d82c4721..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
+++ /dev/null
@@ -1,166 +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.ui.tests.util;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
-	public static String fLineSeparator = System.getProperty("line.separator");
-	public static String fPathSeparator = System.getProperty("path.separator");
-	public static String fFileSeparator = System.getProperty("file.separator");
-	public static String JSP_EDITOR_TESTS_PLUGIN_ID = "org.eclipse.jst.jsp.ui.tests";
-
-	static File previousResultsDirectory = null;
-	static private String logSubDirectoryPath;
-
-	private static boolean notTriedYet = true;
-
-	public static class DirFilenameFilter implements FilenameFilter {
-		String startOfAcceptableNames;
-
-		public DirFilenameFilter(String startOfDirName) {
-			startOfAcceptableNames = startOfDirName;
-		}
-
-		/**
-		 * @see java.io.FileFilter#accept(File)
-		 */
-		public boolean accept(File pathname, String filename) {
-			// we'll just assume if it starts with right key, it is a directory ... for now
-			return filename.startsWith(startOfAcceptableNames);
-		}
-
-	}
-
-	public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
-		if (previousResultsDirectory == null && notTriedYet) {
-			Bundle bundle = Platform.getBundle(JSP_EDITOR_TESTS_PLUGIN_ID);
-			URL url = bundle.getEntry("/");
-			//String installPath = url.getPath();
-			// add known file so URL method below can be used
-			// (doesn't seem to work for directory?)
-			URL totalURL = new URL(url, "plugin.xml");
-			URL finalurl = FileLocator.toFileURL(totalURL);
-			String finalFile = finalurl.getFile();
-			File file = new File(finalFile);
-			String finalPath = file.getParent();
-			File pluginHomeDir = new File(finalPath);
-			FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
-			File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
-			// assume first in list is newest, then start looking with the 
-			// second item ... just to avoid "null" case checking
-			if (allDirs.length > 0) {
-				File currentNewest = allDirs[0];
-				for (int i = 1; i < allDirs.length; i++) {
-					File current = allDirs[i];
-					// NOTE: we go by modified date, not by the actual time stamp in name.
-					// This should work for all normal cases, but may not if someone does some
-					// "funny" copying, or updating from repository.
-					if (current.lastModified() > currentNewest.lastModified()) {
-						currentNewest = current;
-					}
-				}
-				previousResultsDirectory = currentNewest;
-			}
-			notTriedYet = false;
-		}
-		return previousResultsDirectory;
-	}
-
-	public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
-		Bundle bundle = Platform.getBundle(JSP_EDITOR_TESTS_PLUGIN_ID);
-		URL url = bundle.getEntry("/");
-		URL localURL = FileLocator.toFileURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename;
-		URL totalURL = new URL(url, totalPath);
-		//URL finalurl = Platform.asLocalURL(totalURL);
-		String finalFile = totalURL.getFile();
-		File file = new File(finalFile);
-		String finalPath = file.getParent();
-		File dir = new File(finalPath);
-		if (!dir.exists()) {
-			// a little safety net, be sure the previous newest directory
-			// is initialized, just in case no one else has done so
-			if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
-				FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
-			}
-			// now its "safe" to make the new one
-			dir.mkdirs();
-		}
-		return file;
-	}
-
-	/**
-	 * Just a general utility method
-	 * @param filename
-	 * @return String
-	 */
-	public static String getExtension(String filename) {
-		String extension = null;
-		int dotPostion = filename.lastIndexOf('.');
-		if (dotPostion > -1) {
-			extension = filename.substring(dotPostion + 1);
-		}
-		else {
-			extension = new String();
-		}
-		return extension;
-	}
-
-	/**
-	 * General purpose utility method to ensure the log
-	 * directory exists, and returns the name. 
-	 */
-	public static String getLogDirectory() {
-		if (logSubDirectoryPath == null) {
-			String mainDirectory = "/logs";
-			File dir = new File(mainDirectory);
-			ensureExists(dir);
-			String subDirectory = TimestampUtil.timestamp();
-			logSubDirectoryPath = mainDirectory + "/" + subDirectory;
-			File subdir = new File(logSubDirectoryPath);
-			ensureExists(subdir);
-		}
-		return logSubDirectoryPath;
-	}
-
-	public static void ensureExists(File dir) {
-		if (!dir.exists()) {
-			dir.mkdirs();
-		}
-	}
-
-	public static String getPerformanceOutputLogName() {
-		String result = null;
-		String directoryName = FileUtil.getLogDirectory();
-		String extension = ".out";
-		String baseName = "sedTests";
-		long now = System.currentTimeMillis();
-		String nowStr = String.valueOf(now);
-		result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
-		return result;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
deleted file mode 100644
index 85d48c9a2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,392 +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.ui.tests.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- * 
- * @author pavery
- */
-public class ProjectUnzipUtility {
-	class WorkspaceProgressMonitor implements IProgressMonitor {
-		private boolean finished = false;
-
-		public void beginTask(String name, int totalWork) {
-			// noop
-		}
-
-		public void done() {
-			finished = true;
-		}
-
-		public boolean isFinished() {
-			return finished;
-		}
-
-		public void internalWorked(double work) {
-			// noop
-		}
-
-		public boolean isCanceled() {
-			return finished;
-		}
-
-		public void setCanceled(boolean value) {
-			if (value == true)
-				finished = true;
-		}
-
-		public void setTaskName(String name) {
-			// noop
-		}
-
-		public void subTask(String name) {
-			// noop
-		}
-
-		public void worked(int work) {
-			// noop
-		}
-	}
-
-	class MyOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String pathString) {
-			return ALL;
-		}
-	}
-
-	public final static String PROJECT_ZIPS_FOLDER = "projecttestfiles";
-	private List fCreatedProjects = null;
-
-	public ProjectUnzipUtility() {
-		// for deletion later
-		fCreatedProjects = new ArrayList();
-	}
-
-	/**
-	 * @param fileToImport
-	 *            the file you wish to import
-	 * @param folderPath
-	 *            the container path within the workspace
-	 */
-	public void importFile(File fileToImport, String folderPath) {
-		WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
-		try {
-			if (fileToImport.exists()) {
-				IPath containerPath = new Path(folderPath);
-				IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
-				IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
-				File[] filesToImport = {fileToImport};
-				ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
-				importOp.setCreateContainerStructure(false);
-				importOp.setOverwriteResources(true);
-				importOp.run(importProgress);
-			}
-			else {
-				System.out.println("handle source doesn't exist");
-			}
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		finally {
-			importProgress.done();
-		}
-	}
-
-	/**
-	 * the following is logic from
-	 * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
-	 */
-	// specify buffer size for extraction
-	static final int BUFFER = 2048;
-
-	public void unzipAndImport(File inFile, String destinationDirectory) {
-		try {
-			// Specify file to decompress
-			// (nsd) redundant?
-			// String inFileName = inFile.getAbsolutePath();
-			// //"c:/example.zip";
-			// File sourceZipFile = new File(inFileName);
-			File sourceZipFile = inFile;
-
-			// Specify destination where file will be unzipped
-			// String destinationDirectory =
-			// "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
-			File unzipDestinationDirectory = new File(destinationDirectory);
-			// Open Zip file for reading
-			ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
-			IProject currentProject = null;
-			try {
-				// Create an enumeration of the entries in the zip file
-				Enumeration zipFileEntries = zipFile.entries();
-				String projectFolderName = null;
-
-				// Process each entry
-				while (zipFileEntries.hasMoreElements()) {
-					// grab a zip file entry
-					ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
-					String currentEntry = entry.getName();
-					// System.out.println("Extracting: " + entry);
-					File destFile = new File(unzipDestinationDirectory, currentEntry);
-					// grab file's parent directory structure
-					File destinationParent = destFile.getParentFile();
-					// create the parent directory structure if needed
-					destinationParent.mkdirs();
-					// extract file if not a directory
-					if (!entry.isDirectory()) {
-						BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
-						int currentByte;
-						// establish buffer for writing file
-						byte data[] = new byte[BUFFER];
-						// write the current file to disk
-						FileOutputStream fos = new FileOutputStream(destFile);
-						BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER);
-						try {
-							// read and write until last byte is encountered
-							while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
-								dest.write(data, 0, currentByte);
-							}
-						}
-						finally {
-							dest.flush();
-							dest.close();
-							is.close();
-							fos.close();
-						}
-						if (projectFolderName != null)
-							importFile(destFile, projectFolderName);
-					}
-					else {
-						// need handle to the main project folder to create
-						// containerPath
-						if (projectFolderName == null) {
-							projectFolderName = destFile.getName();
-							fCreatedProjects.add(projectFolderName);
-
-							currentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
-						}
-					}
-				}
-			}
-			finally {
-				zipFile.close();
-			}
-
-			// fixes workspace metadata for the project
-			// for clean startup next run
-			if (currentProject != null) {
-				try {
-					Path projectLocation = new Path(Platform.getLocation().toOSString());
-					createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
-				}
-				catch (CoreException cex) {
-					cex.printStackTrace();
-				}
-			}
-		}
-		catch (IOException ioe) {
-			ioe.printStackTrace();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void refreshWorkspace() throws CoreException {
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IProject[] projects = wsRoot.getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-		wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
-	}
-
-	/**
-	 * Delete projects created (unzipped and imported) by this utility
-	 * 
-	 * @throws Exception
-	 */
-	public void deleteProjects() throws Exception {
-		final IProject[] projects = getCreatedProjects();
-		WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				for (int i = 0; i < projects.length; i++) {
-					projects[i].clearHistory(null);
-					projects[i].close(null);
-					projects[i].delete(true, true, null);
-				}
-				refreshWorkspace();
-			}
-		};
-		WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
-		deleteOp.run(progress);
-		// saves the new workspace metadata
-		ResourcesPlugin.getWorkspace().save(true, null);
-	}
-
-	public void deleteProject(String projectName) throws Exception {
-		final String name = projectName;
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		final IProject proj = wsRoot.getProject(name);
-		WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				// IWorkspaceRoot wsRoot =
-				// ResourcesPlugin.getWorkspace().getRoot();
-				// IProject proj = wsRoot.getProject(name);
-				if (proj != null && proj.exists()) {
-					proj.clearHistory(null);
-					// proj.close(null);
-					proj.refreshLocal(IResource.DEPTH_INFINITE, null);
-					try {
-						proj.delete(true, true, null);
-					}
-					catch (Exception e) {
-						// just try again (not sure why they are not being
-						// deleted)
-						proj.refreshLocal(IResource.DEPTH_INFINITE, null);
-						proj.delete(true, true, null);
-					}
-					// proj = null;
-				}
-				refreshWorkspace();
-			}
-		};
-		WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
-		deleteOp.run(progress);
-		// saves the new workspace metadata
-		ResourcesPlugin.getWorkspace().save(true, null);
-	}
-
-	/**
-	 * @return IProjects that were unzipped and imported into the workspace by
-	 *         this utility
-	 */
-	public IProject[] getCreatedProjects() {
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
-		IProject[] projects = new IProject[projectNames.length];
-		for (int i = 0; i < projectNames.length; i++) {
-			projects[i] = wsRoot.getProject(projectNames[i]);
-		}
-		return projects;
-	}
-
-	public void initJavaProject(String projName) throws CoreException {
-		Platform.getJobManager().beginRule(ResourcesPlugin.getWorkspace().getRoot(), new NullProgressMonitor());
-		// resynch
-		refreshWorkspace();
-		// change prereqs to get this functionality back in
-		IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-		
-		if (!proj.exists()) {
-			
-			proj.create(new NullProgressMonitor());
-		}
-		if (!proj.isOpen()) {
-			proj.open(null);
-		}
-		// need to add java nature, or else project won't "exist()" in the
-		// java
-		// element sense
-		IProjectDescription desc = proj.getDescription();
-		List natures = new ArrayList(Arrays.asList(desc.getNatureIds()));
-		if (!natures.contains(JavaCore.NATURE_ID))
-			natures.add(JavaCore.NATURE_ID);
-		desc.setNatureIds((String[]) natures.toArray(new String[0]));
-		proj.setDescription(desc, new NullProgressMonitor());
-		Platform.getJobManager().endRule(ResourcesPlugin.getWorkspace().getRoot());
-		refreshWorkspace();
-	}
-
-	private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new WorkspaceProgressMonitor();
-		}
-		monitor.beginTask("creating test project", 10);
-		// create the project
-		try {
-			if (!project.exists()) {
-				IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
-				if (Platform.getLocation().equals(locationPath)) {
-					locationPath = null;
-				}
-				desc.setLocation(locationPath);
-				project.create(desc, monitor);
-				monitor = null;
-			}
-			if (!project.isOpen()) {
-				project.open(monitor);
-				monitor = null;
-			}
-		}
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
-		final IProject proj = fProject;
-		WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				// IWorkspaceRoot wsRoot =
-				// ResourcesPlugin.getWorkspace().getRoot();
-				// IProject proj = wsRoot.getProject(name);
-				if (proj != null && proj.exists()) {
-					proj.clearHistory(null);
-					// proj.close(null);
-					proj.refreshLocal(IResource.DEPTH_INFINITE, null);
-					proj.delete(true, true, null);
-					// proj = null;
-				}
-				refreshWorkspace();
-			}
-		};
-		// WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
-		deleteOp.run(null);
-		// saves the new workspace metadata
-		// ResourcesPlugin.getWorkspace().save(true, null);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUtil.java
deleted file mode 100644
index 136565247..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUtil.java
+++ /dev/null
@@ -1,187 +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.ui.tests.util;
-
-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.ui.tests.JSPUITestsPlugin;
-
-/**
- * Some utilities for creating projects, and copying files into the workspace.
- */
-public class ProjectUtil {
-
-	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();
-		}	
-	}
-
-	static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
-		Enumeration entries = JSPUITestsPlugin.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);
-		}
-	}
-
-	static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
-		IFile file = null;
-		URL entry = JSPUITestsPlugin.getDefault().getBundle().getEntry(entryname);
-		if (entry != null) {
-			try {
-				byte[] b = new byte[2048];
-				InputStream input = entry.openStream();
-				ByteArrayOutputStream output = new ByteArrayOutputStream();
-				int i = -1;
-				while ((i = input.read(b)) > -1) {
-					output.write(b, 0, i);
-				}
-				file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
-				if (file != null) {
-					if (!file.exists()) {
-						file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
-					}
-					else {
-						file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
-					}
-				}
-			}
-			catch (IOException e) {
-				e.printStackTrace();
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		return file;
-	}
-
-	public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				_copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		try {
-			ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 
-	 * @param entryname path relative to TEST plugin starting w/ a "/"
-	 * 						(eg. "/testfiles/bugnumber/struts-logic.tld")
-	 * @param fullPath path relative to junit test workpace
-	 * 						(eg. "/myruntimeproj/struts-logic.tld")
-	 * @return
-	 */
-	public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {
-		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);
-			}
-		};
-		try {
-			ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return file[0];
-	}
-	
-	public static  IProject createProject(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;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/StringCompareUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/StringCompareUtil.java
deleted file mode 100644
index 0106abbab..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
-	public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
-		if (string1 == null)
-			return false;
-		if (string2 == null)
-			return false;
-
-		StringReader s1Reader = new StringReader(string1);
-		StringReader s2Reader = new StringReader(string2);
-
-		// assume true unless find evidence to the contrary
-		boolean result = true;
-		int s1Char = -1;
-		int s2Char = -1;
-		do {
-
-			s1Char = getNextChar(s1Reader);
-
-			s2Char = getNextChar(s2Reader);
-
-			if (s1Char != s2Char) {
-				result = false;
-				break;
-			}
-		}
-		while (s1Char != -1 && s2Char != -1);
-
-		return result;
-	}
-
-	/**
-	 * Method getNextChar.
-	 * @param s1Reader
-	 * @return char
-	 */
-	private int getNextChar(StringReader reader) {
-		int nextChar = -1;
-		try {
-			nextChar = reader.read();
-			while (isEOL(nextChar)) {
-				nextChar = reader.read();
-			}
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		return nextChar;
-	}
-
-	private boolean isEOL(int aChar) {
-		return (aChar == '\n' || aChar == '\r');
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java
deleted file mode 100644
index 2c9b99355..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java
+++ /dev/null
@@ -1,52 +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.ui.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
-	private static Date timestamp = null;
-	private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
-	//	private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
-	private static String nowShort = null;
-
-	public static String timestamp() {
-
-		if (TimestampUtil.nowShort == null) {
-			TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
-		}
-		return TimestampUtil.nowShort;
-	}
-
-	protected static Date ensureTimestamp() {
-		// just calculate 'timestamp' once per class loading, 
-		// so this 'timestamp' remains the same during 
-		// entire run. 
-		if (TimestampUtil.timestamp == null) {
-			Calendar calendar = Calendar.getInstance();
-			TimestampUtil.timestamp = calendar.getTime();
-		}
-		return TimestampUtil.timestamp;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java
deleted file mode 100644
index a3f107ad8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.util;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class WorkspaceProgressMonitor implements IProgressMonitor {
-	private boolean finished = false;
-
-	public void beginTask(String name, int totalWork) {
-	}
-
-	public void done() {
-		finished = true;
-	}
-
-	public boolean isFinished() {
-		return finished;
-	}
-
-	public void internalWorked(double work) {
-	}
-
-	public boolean isCanceled() {
-		return finished;
-	}
-
-	public void setCanceled(boolean value) {
-		if (value == true)
-			finished = true;
-	}
-
-	public void setTaskName(String name) {
-	}
-
-	public void subTask(String name) {
-	}
-
-	public void worked(int work) {
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/JSPHTMLValidatorTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/JSPHTMLValidatorTest.java
deleted file mode 100644
index f67800537..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/JSPHTMLValidatorTest.java
+++ /dev/null
@@ -1,95 +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.ui.tests.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests HTML validator on jsp file
- */
-public class JSPHTMLValidatorTest extends TestCase {
-	String wtp_autotest_noninteractive = null;
-	private static final String PROJECT_NAME = "bug_143209";
-
-	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()) {
-			ProjectUtil.createProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
-			ProjectUtil.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 jsp expression in html attributes in jsp file
-	 * 
-	 * @throws Exception
-	 */
-	public void testJSPinAttributes() throws Exception {
-		JSPContentValidator validator = new JSPContentValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/usejspinattribute.jsp";
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-
-		assertTrue("jsp in attributes are errors when they should not be (in .jsp)", reporter.getMessages().isEmpty());
-	}
-
-	/**
-	 * Tests jsp expression in html attributes in html file
-	 * 
-	 * @throws Exception
-	 */
-	public void testJSPinAttributesHTML() throws Exception {
-		JSPContentValidator validator = new JSPContentValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/usejspinattribute.html";
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-
-		assertTrue("jsp in attributes are not errors when they should be (in .html)", !reporter.getMessages().isEmpty());
-	}
-
-	/**
-	 * Tests bad attribute names in jsp file false
-	 * 
-	 * @throws Exception
-	 */
-	public void testBadAttributeName() throws Exception {
-		JSPContentValidator validator = new JSPContentValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/badattributenames.jsp";
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-
-		assertTrue("bad attribute name is not error when it should be", !reporter.getMessages().isEmpty());
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ReporterForTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ReporterForTest.java
deleted file mode 100644
index fea98ac88..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/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.ui.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.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ValidationContextForTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/validation/ValidationContextForTest.java
deleted file mode 100644
index 3f613fad1..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/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.ui.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.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java
deleted file mode 100644
index cfd3d2200..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java
+++ /dev/null
@@ -1,256 +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.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationJSP extends TestCase {
-    
-	private StructuredTextViewerConfigurationJSP fConfig = null;
-	private boolean fDisplayExists = true;
-	private StructuredTextViewer fViewer = null;
-	private boolean isSetup = false;
-	
-    public TestViewerConfigurationJSP() {
-        super("TestViewerConfigurationJSP");
-    }
-    protected void setUp() throws Exception {
-		
-    	super.setUp();
-		if(!this.isSetup){
-			setUpViewerConfiguration();
-			this.isSetup = true;
-		}
-    }
-	
-	private void setUpViewerConfiguration() {
-
-		if (Display.getCurrent() != null) {
-			
-			Shell shell = null;
-			Composite parent = null;
-			
-			if(PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			}
-			else {	
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-			
-			// dummy viewer
-			fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-			fConfig = new StructuredTextViewerConfigurationJSP();
-		}
-		else {
-			fDisplayExists = false;
-			Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
-		}
-	}
-    
-	/**
-	 * Not necessary
-	 */
-	public void testGetAnnotationHover() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
-		assertNotNull("AnnotationHover is null", hover);
-    }
-	
-	public void testGetAutoEditStrategies() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IJSPPartitions.JSP_DEFAULT);
-		assertNotNull(strategies);
-		assertTrue("there are no auto edit strategies", strategies.length > 0);
-	}
-	
-	public void testGetConfiguredContentTypes() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		assertNotNull(configuredContentTypes);
-		assertTrue("there are no configured content types", configuredContentTypes.length > 1);
-	}
-	
-	/**
-	 * Not necessary
-	 */
-	public void testGetContentAssistant() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IContentAssistant ca = fConfig.getContentAssistant(fViewer);
-		assertNotNull("there is no content assistant", ca);
-	}
-	
-	public void testGetContentFormatter() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IContentFormatter cf = fConfig.getContentFormatter(fViewer);
-		assertNotNull("there is no content formatter", cf);
-	}
-	
-	public void testGetDoubleClickStrategy() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
-			if(strategy != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured double click strategies", false);
-	}
-	
-	public void testGetHyperlinkDetectors() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
-		assertNotNull("there are no hyperlink detectors", detectors);
-		assertTrue("there are no hyperlink detectors", detectors.length > 1);
-	}
-	
-    public void testGetIndentPrefixes() {
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
-			if(prefixes != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured indent prefixes", false);
-	}
-	
-	/**
-	 * Not necessary
-	 */
-    public void testGetInformationControlCreator() {
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
-		assertNotNull("InformationControlCreator is null", infoCreator);
-    }
-    
-	/**
-	 * Not necessary
-	 */
-	public void testGetInformationPresenter() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
-		assertNotNull("InformationPresenter is null", presenter);
-	}
-	
-	public void testGetLineStyleProviders() {
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
-			if(providers != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured line style providers", false);
-	}
-	
-	/**
-	 * Not necessary
-	 */
-	public void testGetReconciler() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IReconciler r = fConfig.getReconciler(fViewer);
-		assertNotNull("Reconciler is null", r);
-	}
-	
-	public void testGetTextHover() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-
-		String[] hoverPartitions = new String[]{IHTMLPartitions.HTML_DEFAULT,
-													IHTMLPartitions.SCRIPT,
-													IJSPPartitions.JSP_DEFAULT,
-													IJSPPartitions.JSP_DIRECTIVE,
-													IJSPPartitions.JSP_CONTENT_JAVA,
-													IXMLPartitions.XML_DEFAULT};
-		
-		for (int i = 0; i < hoverPartitions.length; i++) {
-			ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
-			assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
-		}
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
deleted file mode 100644
index e162a43da..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
+++ /dev/null
@@ -1,496 +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.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.w3c.dom.Attr;
-
-public class ViewerTestJSP extends ViewPart {
-	private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
-	private final String DEFAULT_VIEWER_CONTENTS = "<%@ page contentType=\"text/html; charset=ISO-8859-1\" %>\n";
-
-	StructuredTextViewer fSourceViewer = null;
-	private StructuredTextViewerConfiguration fConfig = null;
-	private IContentOutlinePage fContentOutlinePage = null;
-	private ISelectionChangedListener fHighlightRangeListener = null;
-
-	/**
-	 * Sets the viewer's highlighting text range to the text range indicated
-	 * by the selected Nodes.
-	 */
-	protected class NodeRangeSelectionListener implements ISelectionChangedListener {
-		public void selectionChanged(SelectionChangedEvent event) {
-			if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
-				IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
-				if (startNode instanceof Attr)
-					startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-				if (endNode instanceof Attr)
-					endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-				int start = startNode.getStartOffset();
-				int end = endNode.getEndOffset();
-
-				fSourceViewer.resetVisibleRegion();
-				fSourceViewer.setVisibleRegion(start, end - start);
-				fSourceViewer.setSelectedRange(start, 0);
-			}
-			else {
-				fSourceViewer.resetVisibleRegion();
-			}
-		}
-	}
-
-	protected class NumberInputDialog extends Dialog {
-		public NumberInputDialog(Shell shell) {
-			super(shell);
-		}
-
-		public Text start;
-		int startValue;
-		public Text length;
-		int lengthValue;
-
-		protected Control createDialogArea(Composite parent) {
-			Composite composite = (Composite) super.createDialogArea(parent);
-			Composite container = new Composite(composite, SWT.NULL);
-			container.setLayoutData(new GridData(GridData.FILL_BOTH));
-			container.setLayout(new GridLayout(2, true));
-			setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
-			Label label = new Label(container, SWT.NULL);
-			label.setText("Start");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			label = new Label(container, SWT.NULL);
-			label.setText("Length");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			start = new Text(container, SWT.BORDER);
-			startValue = fSourceViewer.getVisibleRegion().getOffset();
-			start.setText("" + startValue);
-			start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			length = new Text(container, SWT.BORDER);
-			lengthValue = fSourceViewer.getVisibleRegion().getLength();
-			length.setText("" + lengthValue);
-			length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			// start.addModifyListener(new ModifyListener() {
-			// public void modifyText(ModifyEvent e) {
-			// if (e.widget == start) {
-			// try {
-			// startValue = Integer.decode(start.getText()).intValue();
-			// }
-			// catch (NumberFormatException e2) {
-			// startValue = 0;
-			// }
-			// }
-			// }
-			// });
-			// length.addModifyListener(new ModifyListener() {
-			// public void modifyText(ModifyEvent e) {
-			// if (e.widget == length) {
-			// try {
-			// lengthValue = Integer.decode(length.getText()).intValue();
-			// }
-			// catch (NumberFormatException e2) {
-			// lengthValue = 0;
-			// }
-			// }
-			// }
-			// });
-
-			return composite;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-		 */
-		protected void okPressed() {
-			try {
-				startValue = Integer.decode(start.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				startValue = 0;
-			}
-			try {
-				lengthValue = Integer.decode(length.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				lengthValue = 0;
-			}
-			super.okPressed();
-		}
-	}
-
-	protected void addActions(IContributionManager mgr) {
-		if (mgr != null) {
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "New JSP";
-				}
-
-				public void run() {
-					super.run();
-					BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
-						public void run() {
-							setupViewerForNew();
-							fSourceViewer.setEditable(true);
-						}
-					});
-				}
-			});
-			mgr.add(new Separator());
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility";
-				}
-
-				public void run() {
-					super.run();
-					NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
-					int proceed = dlg.open();
-					if (proceed == Window.CANCEL)
-						return;
-					fSourceViewer.resetVisibleRegion();
-					fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All";
-				}
-
-				public void run() {
-					super.run();
-					fSourceViewer.resetVisibleRegion();
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility in Editor";
-				}
-
-				public void run() {
-					super.run();
-					StructuredTextViewer sourceViewer = null;
-					IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-					if (part != null && part instanceof StructuredTextEditor) {
-						sourceViewer = ((StructuredTextEditor) part).getTextViewer();
-					}
-					if (sourceViewer != null) {
-						NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
-						int proceed = dlg.open();
-						if (proceed == Window.CANCEL)
-							return;
-						sourceViewer.resetVisibleRegion();
-						sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All in Editor";
-				}
-
-				public void run() {
-					super.run();
-					StructuredTextViewer sourceViewer = null;
-					IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-					if (part != null && part instanceof StructuredTextEditor) {
-						sourceViewer = ((StructuredTextEditor) part).getTextViewer();
-					}
-					if (sourceViewer != null) {
-						sourceViewer.resetVisibleRegion();
-					}
-				}
-			});
-			mgr.add(new Separator());
-			// no longer able to set input to NULL
-			// mgr.add(new Action() {
-			// public String getText() {
-			// return getToolTipText();
-			// }
-			//
-			// public String getToolTipText() {
-			// return "Set Input to NULL";
-			// }
-			// public void run() {
-			// super.run();
-			// viewer.setInput(null);
-			// }
-			// });
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input from Active Editor";
-				}
-
-				public void run() {
-					super.run();
-					ITextEditor textEditor = getActiveEditor();
-					if (textEditor != null) {
-						setupViewerForEditor(textEditor);
-						fSourceViewer.setEditable(true);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(true);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection As ReadOnly";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(false);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Stop Following Selection";
-				}
-
-				public void run() {
-					super.run();
-					stopFollowSelection();
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
-		addActions(mgr);
-
-		// create source viewer & its content type-specific viewer
-		// configuration
-		fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-		fConfig = new StructuredTextViewerConfigurationJSP();
-
-		// set up the viewer with a document & viewer config
-		setupViewerForNew();
-
-		setupViewerPreferences();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		stopFollowSelection();
-		fSourceViewer.unconfigure();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
-			fSourceViewer.getControl().setFocus();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-	}
-
-	/**
-	 * Set up source viewer with any additional preferences it should have Ex:
-	 * font, tab width
-	 */
-	private void setupViewerPreferences() {
-		fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
-	}
-
-	/**
-	 * Set up source viewer with a new document & configure it
-	 */
-	private void setupViewerForNew() {
-		stopFollowSelection(); // if was following selection, stop
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-
-		IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		doc.set(DEFAULT_VIEWER_CONTENTS);
-
-		fSourceViewer.setDocument(doc);
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(fConfig);
-	}
-
-	/**
-	 * Returns the current active text editor if possible
-	 * 
-	 * @return ITextEditor
-	 */
-	private ITextEditor getActiveEditor() {
-		ITextEditor editor = null;
-		IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editorPart instanceof ITextEditor)
-			editor = (ITextEditor) editorPart;
-		if (editor == null && editorPart != null)
-			editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
-		return editor;
-	}
-
-	/**
-	 * Sets up the viewer with the same document/input as the given editor
-	 * 
-	 * @param ITextEditor
-	 *            editor - the editor to use *cannot to be null*
-	 */
-	private void setupViewerForEditor(ITextEditor editor) {
-		stopFollowSelection(); // if was following selection, stop
-		IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
-		fSourceViewer.setDocument(doc);
-
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(new StructuredTextViewerConfigurationJSP());
-	}
-
-	/**
-	 * Hooks up the viewer to follow the selection made in the active editor
-	 */
-	private void followSelection() {
-		ITextEditor editor = getActiveEditor();
-		if (editor != null) {
-			setupViewerForEditor(editor);
-			if (fHighlightRangeListener == null)
-				fHighlightRangeListener = new NodeRangeSelectionListener();
-
-			fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
-			if (fContentOutlinePage != null) {
-				fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
-				if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
-					fSourceViewer.resetVisibleRegion();
-
-					Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
-					IndexedRegion startNode = (IndexedRegion) nodes[0];
-					IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
-					if (startNode instanceof Attr)
-						startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-					if (endNode instanceof Attr)
-						endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-					int start = startNode.getStartOffset();
-					int end = endNode.getEndOffset();
-
-					fSourceViewer.setVisibleRegion(start, end - start);
-					fSourceViewer.setSelectedRange(start, 0);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Cease following the selection made in the editor
-	 */
-	private void stopFollowSelection() {
-		if (fContentOutlinePage != null) {
-			fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
-			fSourceViewer.resetVisibleRegion();
-			fContentOutlinePage = null;
-		}
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/test.xml b/tests/org.eclipse.jst.jsp.ui.tests/test.xml
deleted file mode 100644
index 0b6ad656c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-    
-    <property
-        name="plugin-name"
-        value="org.eclipse.jst.jsp.ui.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.jst.jsp.ui.tests.JSPUITestSuite" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip b/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip
deleted file mode 100644
index eb480c52d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts-logic.tld b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts-logic.tld
deleted file mode 100644
index 1975973a7..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts-logic.tld
+++ /dev/null
@@ -1,642 +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.0</tlibversion>
-<jspversion>1.1</jspversion>
-<shortname>logic</shortname>
-<uri>http://jakarta.apache.org/struts/tags-logic</uri>
-<tag>
-<name>empty</name>
-<tagclass>org.apache.struts.taglib.logic.EmptyTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>equal</name>
-<tagclass>org.apache.struts.taglib.logic.EqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>forward</name>
-<tagclass>org.apache.struts.taglib.logic.ForwardTag</tagclass>
-<bodycontent>empty</bodycontent>
-<attribute>
-<name>name</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>greaterEqual</name>
-<tagclass>org.apache.struts.taglib.logic.GreaterEqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>greaterThan</name>
-<tagclass>org.apache.struts.taglib.logic.GreaterThanTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>iterate</name>
-<tagclass>org.apache.struts.taglib.logic.IterateTag</tagclass>
-<teiclass>org.apache.struts.taglib.logic.IterateTei</teiclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>collection</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>id</name>
-<required>true</required>
-<rtexprvalue>false</rtexprvalue>
-</attribute>
-<attribute>
-<name>indexId</name>
-<required>false</required>
-<rtexprvalue>false</rtexprvalue>
-</attribute>
-<attribute>
-<name>length</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>offset</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>type</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>lessEqual</name>
-<tagclass>org.apache.struts.taglib.logic.LessEqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>lessThan</name>
-<tagclass>org.apache.struts.taglib.logic.LessThanTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>match</name>
-<tagclass>org.apache.struts.taglib.logic.MatchTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>location</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>messagesNotPresent</name>
-<tagclass>org.apache.struts.taglib.logic.MessagesNotPresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>message</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>messagesPresent</name>
-<tagclass>org.apache.struts.taglib.logic.MessagesPresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>message</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notEmpty</name>
-<tagclass>org.apache.struts.taglib.logic.NotEmptyTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notEqual</name>
-<tagclass>org.apache.struts.taglib.logic.NotEqualTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notMatch</name>
-<tagclass>org.apache.struts.taglib.logic.NotMatchTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>location</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>notPresent</name>
-<tagclass>org.apache.struts.taglib.logic.NotPresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>role</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>user</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>present</name>
-<tagclass>org.apache.struts.taglib.logic.PresentTag</tagclass>
-<bodycontent>JSP</bodycontent>
-<attribute>
-<name>cookie</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>header</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>parameter</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>role</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>user</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-<tag>
-<name>redirect</name>
-<tagclass>org.apache.struts.taglib.logic.RedirectTag</tagclass>
-<attribute>
-<name>anchor</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>forward</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>href</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>name</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>page</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramId</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramName</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramProperty</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>paramScope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>property</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>scope</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-<attribute>
-<name>transaction</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
-</tag>
-</taglib>
-
-
-
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts.jar b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts.jar
deleted file mode 100644
index db32f9f45..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/116523/struts.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/includer.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/includer.jsp
deleted file mode 100644
index 0f4c9d542..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/includer.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@include file="test189924.jsp" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/test189924.jsp b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/test189924.jsp
deleted file mode 100644
index b9e32d1b8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/189924/test189924.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<%@page session = "false" %>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd
deleted file mode 100644
index 394526f13..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd
+++ /dev/null
@@ -1,353 +0,0 @@
-<!--
-Wireless Markup Language (WML) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-WML is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-          "http://www.wapforum.org/DTD/wml_1.1.xml">
-   <wml>
-   ...
-   </wml>
-
-Terms and conditions of use are available from the Wireless 
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % length  "CDATA">    <!-- [0-9]+ for pixels or [0-9]+"%" for
-                                    percentage length -->
-<!ENTITY % vdata   "CDATA">    <!-- attribute value possibly containing
-                                    variable references -->
-<!ENTITY % HREF    "%vdata;">  <!-- URI, URL or URN designating a hypertext
-                                    node. May contain variable references -->
-<!ENTITY % boolean	"(true|false)">
-<!ENTITY % number  "NMTOKEN">  <!-- a number, with format [0-9]+ -->
-<!ENTITY % coreattrs  "id    ID     #IMPLIED 
-                       class CDATA  #IMPLIED">
-
-<!ENTITY % emph    "em | strong | b | i | u | big | small">
-<!ENTITY % layout  "br">
-
-<!ENTITY % text     "#PCDATA | %emph;">
-
-<!-- flow covers "card-level" elements, such as text and images -->
-<!ENTITY % flow     "%text; | %layout; | img | anchor | a | table">
-
-<!-- Task types -->
-<!ENTITY % task   "go | prev | noop | refresh">
-
-<!-- Navigation and event elements -->
-<!ENTITY % navelmts "do | onevent">
-
-<!--================ Decks and Cards ================-->
-
-<!ELEMENT wml ( head?, template?, card+ )>
-<!ATTLIST wml
-  xml:lang        NMTOKEN        #IMPLIED
-  %coreattrs;
-  >
-
-<!-- card intrinsic events -->
-<!ENTITY % cardev
- "onenterforward  %HREF;          #IMPLIED
-  onenterbackward %HREF;          #IMPLIED
-  ontimer         %HREF;          #IMPLIED"
-  >
-
-<!-- card field types -->
-<!ENTITY % fields  "%flow; | input | select | fieldset">
-
-<!ELEMENT card (onevent*, timer?, (do | p)*)>
-<!ATTLIST card
-  title           %vdata;       #IMPLIED
-  newcontext      %boolean;     "false"
-  ordered         %boolean;     "true"
-  xml:lang        NMTOKEN       #IMPLIED
-  %cardev;
-  %coreattrs;
-  >
-
-<!--================ Event Bindings ================-->
-
-<!ELEMENT do (%task;)>
-<!ATTLIST do
-  type         CDATA       #REQUIRED
-  label        %vdata;     #IMPLIED
-  name         NMTOKEN     #IMPLIED
-  optional     %boolean;   "false"
-  xml:lang     NMTOKEN     #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT onevent (%task;)>
-<!ATTLIST onevent
-  type         CDATA       #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Deck-level declarations ================-->
-
-<!ELEMENT head ( access | meta )+>
-<!ATTLIST head
-  %coreattrs;
-  >
-
-<!ELEMENT template (%navelmts;)*>
-<!ATTLIST template
-  %cardev;
-  %coreattrs;
-  >
-
-<!ELEMENT access EMPTY>
-<!ATTLIST access
-  domain       CDATA       #IMPLIED
-  path         CDATA       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  http-equiv     CDATA      #IMPLIED
-  name           CDATA      #IMPLIED
-  forua          %boolean;  #IMPLIED
-  content        CDATA      #REQUIRED
-  scheme         CDATA      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Tasks ================-->
-
-<!ELEMENT go (postfield | setvar)*>
-<!ATTLIST go
-  href            %HREF;           #REQUIRED
-  sendreferer     %boolean;       "false"
-  method          (post|get)      "get"
-  accept-charset  CDATA           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT prev (setvar)*>
-<!ATTLIST prev
-  %coreattrs;
-  >
-
-<!ELEMENT refresh (setvar)*>
-<!ATTLIST refresh
-  %coreattrs;
-  >
-
-<!ELEMENT noop EMPTY>
-<!ATTLIST noop
-  %coreattrs;
-  >
-
-<!--================ postfield ================-->
- 
-<!ELEMENT postfield EMPTY>
-<!ATTLIST postfield
-  name         %vdata;           #REQUIRED
-  value        %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ variables ================-->
-
-<!ELEMENT setvar EMPTY>
-<!ATTLIST setvar
-  name         %vdata;           #REQUIRED
-  value        %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Card Fields ================-->
-
-<!ELEMENT select (optgroup|option)+>
-<!ATTLIST select
-  title        %vdata;           #IMPLIED
-  name         NMTOKEN           #IMPLIED
-  value        %vdata;           #IMPLIED
-  iname        NMTOKEN           #IMPLIED
-  ivalue       %vdata;           #IMPLIED
-  multiple     %boolean;         "false"
-  tabindex     %number;          #IMPLIED
-  xml:lang     NMTOKEN           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT optgroup (optgroup|option)+ >
-<!ATTLIST optgroup
-  title      %vdata;    #IMPLIED
-  xml:lang   NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT option (#PCDATA | onevent)*>
-<!ATTLIST option
-  value      %vdata;    #IMPLIED
-  title      %vdata;    #IMPLIED
-  onpick     %HREF;     #IMPLIED
-  xml:lang   NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT input EMPTY>
-<!ATTLIST input
-  name       NMTOKEN           #REQUIRED
-  type       (text|password)   "text"
-  value      %vdata;           #IMPLIED
-  format     CDATA             #IMPLIED
-  emptyok    %boolean;         "false"
-  size       %number;          #IMPLIED
-  maxlength  %number;          #IMPLIED
-  tabindex   %number;          #IMPLIED
-  title      %vdata;           #IMPLIED
-  xml:lang   NMTOKEN           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT fieldset (%fields; | do)* >
-<!ATTLIST fieldset
-  title           %vdata;      #IMPLIED
-  xml:lang        NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT timer EMPTY>
-<!ATTLIST timer
-  name       NMTOKEN           #IMPLIED
-  value      %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Images ================-->
-
-<!ENTITY % IAlign "(top|middle|bottom)" >
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  alt        %vdata;      #REQUIRED
-  src        %HREF;       #REQUIRED
-  localsrc   %vdata;      #IMPLIED
-  vspace     %length;     "0"
-  hspace     %length;     "0"
-  align      %IAlign;     "bottom"
-  height     %length;     #IMPLIED
-  width      %length;     #IMPLIED
-  xml:lang   NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Anchor ================-->
-
-<!ELEMENT anchor ( #PCDATA | br | img | go | prev | refresh )*>
-<!ATTLIST anchor
-  title        %vdata;      #IMPLIED
-  xml:lang     NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT a ( #PCDATA | br | img )*>
-<!ATTLIST a
-  href         %HREF;       #REQUIRED
-  title        %vdata;      #IMPLIED
-  xml:lang     NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Tables ================-->
-
-<!ELEMENT table (tr)+>
-<!ATTLIST table
-  title       %vdata;    #IMPLIED
-  align       CDATA      #IMPLIED
-  columns     %number;   #REQUIRED
-  xml:lang    NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT tr (td)+>
-<!ATTLIST tr
-  %coreattrs;
-  >
-
-<!ELEMENT td ( %text; | %layout; | img | anchor | a )*>
-<!ATTLIST td
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Text layout and line breaks ================-->
-
-<!ELEMENT em     (%flow;)*>
-<!ATTLIST em
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT strong (%flow;)*>
-<!ATTLIST strong
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT b      (%flow;)*>
-<!ATTLIST b
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT i      (%flow;)*>
-<!ATTLIST i
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT u      (%flow;)*>
-<!ATTLIST u
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT big    (%flow;)*>
-<!ATTLIST big
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT small  (%flow;)*>
-<!ATTLIST small
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ENTITY % TAlign "(left|right|center)">
-<!ENTITY % WrapMode "(wrap|nowrap)" >
-<!ELEMENT p (%fields; | do)*>
-<!ATTLIST p
-  align       %TAlign;     "left"
-  mode        %WrapMode;   #IMPLIED
-  xml:lang    NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT br EMPTY>
-<!ATTLIST br
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ENTITY quot  "&#34;">     <!-- quotation mark -->
-<!ENTITY amp   "&#38;#38;"> <!-- ampersand -->
-<!ENTITY apos  "&#39;">     <!-- apostrophe -->
-<!ENTITY lt    "&#38;#60;"> <!-- less than -->
-<!ENTITY gt    "&#62;">     <!-- greater than -->
-<!ENTITY nbsp  "&#160;">    <!-- non-breaking space -->
-<!ENTITY shy   "&#173;">    <!-- soft hyphen (discretionary hyphen) -->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd
deleted file mode 100644
index df2103a79..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-      This DTD is identified by the PUBLIC identifier:
-     	"-//WAPFORUM//DTD CHANNEL 1.2//EN"
--->
-
-<!ENTITY % Boolean "( true | false )">
-
-<!-- a Uniform Resource Identifier -->
-<!ENTITY % URI "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number "CDATA" >  
-
-<!-- Channel Events -->
-<!ENTITY % ChannelEvent.attribs
-	"success		%URI;		#IMPLIED
-	 failure		%URI;		#IMPLIED"
->
-
-<!ELEMENT channel (title , abstract? , resource* ) >
-<!ATTLIST channel
-	maxspace		%Number;	#REQUIRED 
-	base			%URI;		#IMPLIED
-	eventid			CDATA		#IMPLIED
-	channelid		CDATA		#REQUIRED 
-	useraccessible 		%Boolean;	"false"
-	%ChannelEvent.attribs;
->
-
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT abstract (#PCDATA)>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
-	href      	%URI;	   	#REQUIRED
-	lastmod		%Number;	#IMPLIED
-	etag		NMTOKEN		#IMPLIED
-	md5		NMTOKEN		#IMPLIED
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd
deleted file mode 100644
index 67ed0d24a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd
+++ /dev/null
@@ -1,219 +0,0 @@
-<!--
-Push Access Protocol (PAP) v1.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
-
-PAP is an XML language. Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE pap PUBLIC "-//WAPFORUM//DTD PAP 1.0//EN"
-             "http://www.wapforum.org/DTD/pap_1.0.dtd">
-   <pap>
-      ...
-   </pap>
-
-Terms and conditions of use are available from the Wireless 
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % Datetime "CDATA">     <!-- ISO date and time -->
-<!ENTITY % State  "(rejected | pending 
-                  | delivered | undeliverable 
-                  | expired | aborted 
-                  | timeout | cancelled | unknown)">        
-                                 <!-- PPG Message State -->
-
-
-<!ELEMENT pap                    ( push-message
-                                 | push-response
-                                 | cancel-message
-                                 | cancel-response
-                                 | resultnotification-message
-                                 | resultnotification-response
-                                 | statusquery-message
-                                 | statusquery-response
-                                 | ccq-message
-                                 | ccq-response 
-                                 | badmessage-response) >
-<!ATTLIST pap
-          product-name           CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of push submission message    -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT push-message ( address+, quality-of-service? ) >
-<!ATTLIST push-message
-          push-id                    CDATA             #REQUIRED
-          deliver-before-timestamp   %Datetime;        #IMPLIED
-          deliver-after-timestamp    %Datetime;        #IMPLIED
-          source-reference           CDATA             #IMPLIED
-          ppg-notify-requested-to    CDATA             #IMPLIED 
-          progress-notes-requested   ( true | false )  "false"
->
-
-<!ELEMENT address EMPTY >
-<!ATTLIST address
-          address-value          CDATA             #REQUIRED 
->
-
-<!ELEMENT quality-of-service EMPTY >
-<!ATTLIST quality-of-service
-          priority               ( high | medium | low )        "medium"
-          delivery-method        ( confirmed | preferconfirmed 
-                                 | unconfirmed | notspecified ) "notspecified"
-          network                CDATA                          #IMPLIED
-          network-required       ( true | false )               "false"
-          bearer                 CDATA                          #IMPLIED
-          bearer-required        ( true | false )               "false"
->
-
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT push-response ( progress-note*, response-result ) >
-<!ATTLIST push-response
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          reply-time             %Datetime;        #IMPLIED
->
-
-<!ELEMENT progress-note EMPTY >
-<!ATTLIST progress-note
-          stage                  CDATA             #REQUIRED
-          note                   CDATA             #IMPLIED
-          time                   %Datetime;        #IMPLIED
->
-
-<!ELEMENT response-result EMPTY >
-<!ATTLIST response-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of cancel operation           -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT cancel-message ( address* ) >
-<!ATTLIST cancel-message
-          push-id                CDATA             #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT cancel-response ( cancel-result+ ) >
-<!ATTLIST cancel-response
-          push-id                CDATA             #REQUIRED
->
-
-<!ELEMENT cancel-result ( address* ) >
-<!ATTLIST cancel-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of notify result operation    -->
-<!-- ========================================= -->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT resultnotification-message ( address, quality-of-service? ) >
-<!ATTLIST resultnotification-message
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          received-time          %Datetime;        #IMPLIED
-          event-time             %Datetime;        #IMPLIED
-          message-state          %State;           #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT resultnotification-response ( address ) >
-<!ATTLIST resultnotification-response
-          push-id                CDATA             #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of statusquery operation      -->
-<!-- ========================================= -->
-
- class='del'>-		  <method-param>mypackage.MyClass</method-param>
-		  <method-param>mypackage.MyClass[][]</method-param>
-	      </method-params>
-	  </method>
-
-	  The optional method-intf element can be used when it becomes
-	  necessary to differentiate between a method that is multiply
-	  defined across the enterprise bean's business, home, component,
-          and/or web service endpoint interfaces with the same name and
-	  signature. However, if the same method is a method of both the
-          local business interface, and the local component interface,
-          the same attribute applies to the method for both interfaces.
-          Likewise, if the same method is a method of both the remote
-          business interface and the remote component interface, the same
-          attribute applies to the method for both interfaces.
-
-	  For example, the method element
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Remote</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  can be used to differentiate the create(String, String)
-	  method defined in the remote interface from the
-	  create(String, String) method defined in the remote home
-	  interface, which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  and the create method that is defined in the local home
-	  interface which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>LocalHome</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The method-intf element can be used with all three Styles
-	  of the method element usage. For example, the following
-	  method element example could be used to refer to all the
-	  methods of the EmployeeService bean's remote home interface
-          and the remote business interface.
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>*</method-name>
-	  </method>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="method-intf"
-		   type="javaee:method-intfType"
-		   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="method-name"
-		   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="multiplicityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The multiplicityType describes the multiplicity of the
-	role that participates in a relation.
-
-	The value must be one of the two following:
-
-	    One
-	    Many
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="One"/>
-	<xsd:enumeration value="Many"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="named-methodType">
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="javaee:string"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The persistence-typeType specifies an entity bean's persistence
-	management type.
-
-	The persistence-type element must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="query-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The query-method specifies the method for a finder or select
-	  query.
-
-	  The method-name element specifies the name of a finder or select
-	  method in the entity bean's implementation class.
-
-	  Each method-param must be defined for a query-method using the
-	  method-params element.
-
-	  It is used by the query-method element.
-
-	  Example:
-
-	  <query>
-	      <description>Method finds large orders</description>
-	      <query-method>
-		  <method-name>findLargeOrders</method-name>
-		  <method-params></method-params>
-	      </query-method>
-	      <ejb-ql>
-		SELECT OBJECT(o) FROM Order o
-		  WHERE o.amount &gt; 1000
-	      </ejb-ql>
-	  </query>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="queryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The queryType defines a finder or select
-	query. It contains
-	    - an optional description of the query
-	    - the specification of the finder or select
-	      method it is used by
-		- an optional specification of the result type
-		  mapping, if the query is for a select method
-		  and entity objects are returned.
-		- the EJB QL query string that defines the query.
-
-	Queries that are expressible in EJB QL must use the ejb-ql
-	element to specify the query. If a query is not expressible
-	in EJB QL, the description element should be used to
-	describe the semantics of the query and the ejb-ql element
-	should be empty.
-
-	The result-type-mapping is an optional element. It can only
-	be present if the query-method specifies a select method
-	that returns entity objects.  The default value for the
-	result-type-mapping element is "Local".
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType" minOccurs="0"/>
-      <xsd:element name="query-method"
-		   type="javaee:query-methodType"/>
-      <xsd:element name="result-type-mapping"
-		   type="javaee:result-type-mappingType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-ql"
-		   type="javaee:xsdStringType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationship-role-sourceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationship-role-sourceType designates the source of a
-	role that participates in a relationship. A
-	relationship-role-sourceType is used by
-	relationship-role-source elements to uniquely identify an
-	entity bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationshipsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationshipsType describes the relationships in
-	which entity beans with container-managed persistence
-	participate. The relationshipsType contains an optional
-	description; and a list of ejb-relation elements, which
-	specify the container managed relationships.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation"
-		   type="javaee:ejb-relationType"
-		   maxOccurs="unbounded">
-
-	<xsd:unique name="role-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relationship-role-name contains the name of a
-	      relationship role. The name must be unique within
-	      a relationship, but can be reused in different
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector
-	       xpath=".//javaee:ejb-relationship-role-name"/>
-	  <xsd:field
-	       xpath="."/>
-	</xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remove-methodType">
-    <xsd:sequence>
-      <xsd:element name="bean-method"
-		   type="javaee:named-methodType"/>
-      <xsd:element name="retain-if-exception"
-		   type="javaee:true-falseType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="result-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The result-type-mappingType is used in the query element to
-	specify whether an abstract schema type returned by a query
-	for a select method is to be mapped to an EJBLocalObject or
-	EJBObject type.
-
-	The value must be one of the following:
-
-	    Local
-	    Remote
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="Remote"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-identityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-identityType specifies whether the caller's
-	security identity is to be used for the execution of the
-	methods of the enterprise bean or whether a specific run-as
-	identity is to be used. It contains an optional description
-	and a specification of the security identity to be used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="use-caller-identity"
-		     type="javaee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The use-caller-identity element specifies that
-	      the caller's security identity be used as the
-	      security identity for the execution of the
-	      enterprise bean's methods.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="run-as"
-		     type="javaee:run-asType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-beanType declares an session bean. The
-	declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a name assigned to the enterprise bean
-	      in the deployment description
-            - an optional mapped-name element that can be used to provide
-              vendor-specific deployment information such as the physical
-              jndi-name of the session bean's remote home/business interface.
-              This element is not required to be supported by all
-              implementations. Any use of this element is non-portable.
-            - the names of all the remote or local business interfaces,
-              if any
-	    - the names of the session bean's remote home and
-	      remote interfaces, if any
-	    - the names of the session bean's local home and
-	      local interfaces, if any
-	    - the name of the session bean's web service endpoint
-	      interface, if any
-	    - the session bean's implementation class
-	    - the session bean's state management type
-            - an optional declaration of the session bean's timeout method.
-	    - the optional session bean's transaction management type.
-              If it is not present, it is defaulted to Container.
-            - an optional list of the session bean class and/or
-              superclass around-invoke methods.
-	    - an optional declaration of the bean's
-	      environment entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's resource
-	      manager connection factory references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-	The elements that are optional are "optional" in the sense
-	that they are omitted when if lists represented by them are
-	empty.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified for the
-	session bean.
-
-	The service-endpoint element may only be specified if the
-	bean is a stateless session bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="javaee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="javaee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="javaee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="javaee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="business-local"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="business-remote"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="service-endpoint"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint element contains the
-	    fully-qualified name of the enterprise bean's web
-	    service endpoint interface. The service-endpoint
-	    element may only be specified for a stateless
-	    session bean. The specified interface must be a
-	    valid JAX-RPC service endpoint interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-class"
-		   type="javaee:ejb-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-             The ejb-class element specifies the fully qualified name
-             of the bean class for this ejb.  It is required unless
-             there is a component-defining annotation for the same
-             ejb-name.
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="session-type"
-		   type="javaee:session-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="init-method"
-                   type="javaee:init-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-method element specifies the mappings for
-	    EJB 2.x style create methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="remove-method"
-                   type="javaee:remove-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The remove-method element specifies the mappings for
-	    EJB 2.x style remove methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="transaction-type"
-		   type="javaee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="post-activate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-passivate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="security-role-ref"
-		   type="javaee:security-role-refType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="security-identity"
-		   type="javaee:security-identityType"
-		   minOccurs="0">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-typeType describes whether the session bean is a
-	stateful session or stateless session. It is used by
-	session-type elements.
-
-	The value must be one of the two following:
-
-	    Stateful
-	    Stateless
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Stateful"/>
-	<xsd:enumeration value="Stateless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="trans-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The trans-attributeType specifies how the container must
-	manage the transaction boundaries when delegating a method
-	invocation to an enterprise bean's business method.
-
-	The value must be one of the following:
-
-	    NotSupported
-	    Supports
-	    Required
-	    RequiresNew
-	    Mandatory
-	    Never
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="NotSupported"/>
-	<xsd:enumeration value="Supports"/>
-	<xsd:enumeration value="Required"/>
-	<xsd:enumeration value="RequiresNew"/>
-	<xsd:enumeration value="Mandatory"/>
-	<xsd:enumeration value="Never"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transaction-typeType specifies an enterprise bean's
-	transaction management type.
-
-	The transaction-type must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_1_4.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_1_4.xsd
deleted file mode 100644
index 9b2334c2e3..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_1_4.xsd
+++ /dev/null
@@ -1,1608 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="1.4">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_1_4.xsds	1.43 03/09/16
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following definitions that appear in the common
-shareable schema(s) of J2EE deployment descriptors should be
-interpreted with respect to the context they are included:
-
-Deployment Component may indicate one of the following:
-    j2ee application;
-    application client;
-    web application;
-    enterprise bean;
-    resource adapter;
-
-Deployment File may indicate one of the following:
-    ear file;
-    war file;
-    jar file;
-    rar file;
-
-</xsd:documentation>
-</xsd:annotation>
-
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-	      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-  <xsd:include schemaLocation=
-	"http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:group name="descriptionGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained description related
-	elements consistent across J2EE deployment descriptors.
-
-	All elements may occur multiple times with different languages,
-	to support localization of the content.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="display-name"
-		   type="j2ee:display-nameType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="icon"
-		   type="j2ee:iconType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The description type is used by a description element to
-	provide text describing the parent element.  The elements
-	that use this type should include any information that the
-	Deployment Component's Deployment File file producer wants
-	to provide to the consumer of the Deployment Component's
-	Deployment File (i.e., to the Deployer). Typically, the
-	tools used by such a Deployment File consumer will display
-	the description when processing the parent element that
-	contains the description.
-
-	The lang attribute defines the language that the
-	description is provided in. The default value is "en" (English).
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="j2ee:xsdStringType">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="dewey-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines a dewey decimal which is used
-	to describe versions of documents.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:decimal">
-      <xsd:whiteSpace value="collapse"/>
-    </xsd:restriction>
-
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="display-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The display-name type contains a short name that is intended
-	  to be displayed by tools. It is used by display-name
-	  elements.  The display name need not be unique.
-
-	  Example:
-
-	  ...
-	     <display-name xml:lang="en">Employee Self Service</display-name>
-
-	  The value of the xml:lang attribute is "en" (English) by default.
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="j2ee:string">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-linkType is used by ejb-link
-	  elements in the ejb-ref or ejb-local-ref elements to specify
-	  that an EJB reference is linked to enterprise bean.
-
-	  The value of the ejb-link element must be the ejb-name of an
-	  enterprise bean in the same ejb-jar file or in another ejb-jar
-	  file in the same J2EE application unit.
-
-	  Alternatively, the name in the ejb-link element may be
-	  composed of a path name specifying the ejb-jar containing the
-	  referenced enterprise bean with the ejb-name of the target
-	  bean appended and separated from the path name by "#".  The
-	  path name is relative to the Deployment File containing
-	  Deployment Component that is referencing the enterprise
-	  bean.  This allows multiple enterprise beans with the same
-	  ejb-name to be uniquely identified.
-
-	  Examples:
-
-	      <ejb-link>EmployeeRecord</ejb-link>
-
-	      <ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-local-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-local-refType is used by ejb-local-ref elements for
-	the declaration of a reference to an enterprise bean's local
-	home. The declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of the Deployment
-	      Component that's referencing the enterprise bean
-	    - the expected type of the referenced enterprise bean
-	    - the expected local home and local interfaces of the
-	      referenced enterprise bean
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="j2ee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="j2ee:ejb-ref-typeType"/>
-      <xsd:element name="local-home"
-		   type="j2ee:local-homeType"/>
-      <xsd:element name="local"
-		   type="j2ee:localType"/>
-      <xsd:element name="ejb-link"
-		   type="j2ee:ejb-linkType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the
-	  Deployment Component's environment and is relative to the
-	  java:comp/env context.  The name must be unique within the
-	  Deployment Component.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	  Example:
-
-	  <ejb-ref-name>ejb/Payroll</ejb-ref-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:jndi-nameType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-ref-typeType contains the expected type of the
-	referenced enterprise bean.
-
-	The ejb-ref-type designates a value
-	that must be one of the following:
-
-	    Entity
-	    Session
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Entity"/>
-	<xsd:enumeration value="Session"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-refType is used by ejb-ref elements for the
-	declaration of a reference to an enterprise bean's home. The
-	declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of
-	      the Deployment Component that's referencing the enterprise
-	      bean
-	    - the expected type of the referenced enterprise bean
-	    - the expected home and remote interfaces of the referenced
-	      enterprise bean
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="j2ee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="j2ee:ejb-ref-typeType"/>
-
-      <xsd:element name="home"
-		   type="j2ee:homeType"/>
-      <xsd:element name="remote"
-		   type="j2ee:remoteType"/>
-      <xsd:element name="ejb-link"
-		   type="j2ee:ejb-linkType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="emptyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is used to designate an empty
-	element when used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entry-type-valuesType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  This type contains the fully-qualified Java type of the
-	  environment entry value that is expected by the
-	  application's code.
-
-	  The following are the legal values of env-entry-type-valuesType:
-
-	      java.lang.Boolean
-	      java.lang.Byte
-	      java.lang.Character
-	      java.lang.String
-	      java.lang.Short
-	      java.lang.Integer
-	      java.lang.Long
-	      java.lang.Float
-	      java.lang.Double
-
-	  Example:
-
-	  <env-entry-type>java.lang.Boolean</env-entry-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="java.lang.Boolean"/>
-	<xsd:enumeration value="java.lang.Byte"/>
-	<xsd:enumeration value="java.lang.Character"/>
-	<xsd:enumeration value="java.lang.String"/>
-	<xsd:enumeration value="java.lang.Short"/>
-	<xsd:enumeration value="java.lang.Integer"/>
-	<xsd:enumeration value="java.lang.Long"/>
-	<xsd:enumeration value="java.lang.Float"/>
-	<xsd:enumeration value="java.lang.Double"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The env-entryType is used to declare an application's
-	environment entry. The declaration consists of an optional
-	description, the name of the environment entry, and an
-	optional value.  If a value is not specified, one must be
-	supplied during deployment.
-
-	It is used by env-entry elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="env-entry-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-name element contains the name of a
-	      Deployment Component's environment entry.  The name
-	      is a JNDI name relative to the java:comp/env
-	      context.  The name must be unique within a
-	      Deployment Component. The uniqueness
-	      constraints must be defined within the declared
-	      context.
-
-	      Example:
-
-	      <env-entry-name>minAmount</env-entry-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="env-entry-type"
-		   type="j2ee:env-entry-type-valuesType"/>
-
-      <xsd:element name="env-entry-value"
-		   type="j2ee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-value designates the value of a
-	      Deployment Component's environment entry. The value
-	      must be a String that is valid for the
-	      constructor of the specified type that takes a
-	      single String parameter, or for java.lang.Character,
-	      a single character.
-
-	      Example:
-
-	      <env-entry-value>100.00</env-entry-value>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="fully-qualified-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate the name of a
-	Java class or interface.  The name is in the form of a
-	"binary name", as defined in the JLS.  This is the form
-	of name used in Class.forName().  Tools that need the
-	canonical name (the name used in source code) will need
-	to convert this binary name to the canonical name.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="generic-booleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines four different values which can designate
-	boolean values. This includes values yes and no which are
-	not designated by xsd:boolean
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="true"/>
-	<xsd:enumeration value="false"/>
-	<xsd:enumeration value="yes"/>
-	<xsd:enumeration value="no"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The homeType defines the fully-qualified name of
-	  an enterprise bean's home interface.
-
-	  Example:
-
-	      <home>com.aardvark.payroll.PayrollHome</home>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="iconType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The icon type contains small-icon and large-icon elements
-	that specify the file names for small and large GIF or
-	JPEG icon images used to represent the parent element in a
-	GUI tool.
-
-	The xml:lang attribute defines the language that the
-	icon file names are provided in. Its value is "en" (English)
-	by default.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="small-icon" type="j2ee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The small-icon element contains the name of a file
-	      containing a small (16 x 16) icon image. The file
-	      name is a relative path within the Deployment
-	      Component's Deployment File.
-
-	      The image may be either in the JPEG or GIF format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <small-icon>employee-service-icon16x16.jpg</small-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="large-icon" type="j2ee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The large-icon element contains the name of a file
-	      containing a large
-	      (32 x 32) icon image. The file name is a relative
-	      path within the Deployment Component's Deployment
-	      File.
-
-	      The image may be either in the JPEG or GIF format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <large-icon>employee-service-icon32x32.jpg</large-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-
-    <xsd:attribute ref="xml:lang"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-identifierType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The java-identifierType defines a Java identifier.
-	The users of this type should further verify that
-	the content does not contain Java reserved keywords.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a generic type that designates a Java primitive
-	type or a fully qualified name of a Java interface/type,
-	or an array of such types.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:pattern value="[^\p{Z}]*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jndi-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jndi-nameType type designates a JNDI name in the
-	Deployment Component's environment and is relative to the
-	java:comp/env context.  A JNDI name must be unique within the
-	Deployment Component.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="jndiEnvironmentRefsGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained JNDI environment
-	reference elements consistent across J2EE deployment descriptors.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="env-entry"
-		   type="j2ee:env-entryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-		   type="j2ee:ejb-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-local-ref"
-		   type="j2ee:ejb-local-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:group ref="j2ee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-		   type="j2ee:resource-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-		   type="j2ee:resource-env-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-		   type="j2ee:message-destination-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="listenerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The listenerType indicates the deployment properties for a web
-	application listener bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="listener-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The listener-class element declares a class in the
-	    application must be registered as a web
-	    application listener bean. The value is the fully
-	    qualified classname of the listener class.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="local-homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The local-homeType defines the fully-qualified
-	name of an enterprise bean's local home interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="localType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The localType defines the fully-qualified name of an
-	enterprise bean's local interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-linkType is used to link a message
-	destination reference or message-driven bean to a message
-	destination.
-
-	The Assembler sets the value to reflect the flow of messages
-	between producers and consumers in the application.
-
-	The value must be the message-destination-name of a message
-	destination in the same Deployment File or in another
-	Deployment File in the same J2EE application unit.
-
-	Alternatively, the value may be composed of a path name
-	specifying a Deployment File containing the referenced
-	message destination with the message-destination-name of the
-	destination appended and separated from the path name by
-	"#". The path name is relative to the Deployment File
-	containing Deployment Component that is referencing the
-	message destination.  This allows multiple message
-	destinations with the same name to be uniquely identified.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-ref element contains a declaration
-	  of Deployment Component's reference to a message destination
-	  associated with a resource in Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the message destination reference name
-		  - the message destination type
-		  - a specification as to whether the
-		    destination is used for
-		    consuming or producing messages, or both
-		  - a link to the message destination
-
-	  Examples:
-
-	  <message-destination-ref>
-		  <message-destination-ref-name>jms/StockQueue
-		  </message-destination-ref-name>
-		  <message-destination-type>javax.jms.Queue
-		  </message-destination-type>
-		  <message-destination-usage>Consumes
-		  </message-destination-usage>
-		  <message-destination-link>CorporateStocks
-		  </message-destination-link>
-	  </message-destination-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-ref-name element specifies
-	    the name of a message destination reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context and must be
-	    unique within an ejb-jar (for enterprise beans) or a
-	    Deployment File (for others).
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination-type"
-		   type="j2ee:message-destination-typeType"/>
-      <xsd:element name="message-destination-usage"
-		   type="j2ee:message-destination-usageType"/>
-      <xsd:element name="message-destination-link"
-		   type="j2ee:message-destination-linkType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-typeType specifies the type of
-	  the destination. The type is specified by the Java interface
-	  expected to be implemented by the destination.
-
-	  Example:
-
-	    <message-destination-type>javax.jms.Queue
-	    </message-destination-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-usageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-usageType specifies the use of the
-	message destination indicated by the reference.  The value
-	indicates whether messages are consumed from the message
-	destination, produced for the destination, or both.  The
-	Assembler makes use of this information in linking producers
-	of a destination with its consumers.
-
-	The value of the message-destination-usage element must be
-	one of the following:
-	    Consumes
-	    Produces
-	    ConsumesProduces
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Consumes"/>
-	<xsd:enumeration value="Produces"/>
-	<xsd:enumeration value="ConsumesProduces"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destinationType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destinationType specifies a message
-	  destination. The logical destination described by this
-	  element is mapped to a physical destination by the Deployer.
-
-	  The message destination element contains:
-
-		  - an optional description
-		  - an optional display-name
-		  - an optional icon
-		  - a message destination name which must be unique
-		    among message destination names within the same
-		    Deployment File.
-
-	  Example:
-
-	  <message-destination>
-		  <message-destination-name>CorporateStocks
-		  </message-destination-name>
-	  </message-destination>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="message-destination-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-name element specifies a
-	    name for a message destination.  This name must be
-	    unique among the names of message destinations
-	    within the Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="param-valueType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is a general type that can be used to declare
-	parameter/value lists.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="param-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-name element contains the name of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="param-value"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-value element contains the value of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate either a relative
-	path or an absolute path starting with a "/".
-
-	In elements that specify a pathname to a file within the
-	same Deployment File, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the Deployment File's namespace.  Absolute filenames (i.e.,
-	those starting with "/") also specify names in the root of
-	the Deployment File's namespace.  In general, relative names
-	are preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remoteType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The remote element contains the fully-qualified name
-	  of the enterprise bean's remote interface.
-
-	  Example:
-
-	      <remote>com.wombat.empl.EmployeeService</remote>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-authType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-authType specifies whether the Deployment Component
-	code signs on programmatically to the resource manager, or
-	whether the Container will sign on to the resource manager
-	on behalf of the Deployment Component. In the latter case,
-	the Container uses information that is supplied by the
-	Deployer.
-
-	The value must be one of the two following:
-
-	    Application
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Application"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-sharing-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-sharing-scope type specifies whether connections
-	obtained through the given resource manager connection
-	factory reference can be shared. The value, if specified,
-	must be one of the two following:
-
-	    Shareable
-	    Unshareable
-
-	The default value is Shareable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Shareable"/>
-	<xsd:enumeration value="Unshareable"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-env-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-env-refType is used to define
-	  resource-env-type elements.  It contains a declaration of a
-	  Deployment Component's reference to an administered object
-	  associated with a resource in the Deployment Component's
-	  environment.  It consists of an optional description, the
-	  resource environment reference name, and an indication of
-	  the resource environment reference type expected by the
-	  Deployment Component code.
-
-	  Example:
-
-	  <resource-env-ref>
-	      <resource-env-ref-name>jms/StockQueue
-	      </resource-env-ref-name>
-	      <resource-env-ref-type>javax.jms.Queue
-	      </resource-env-ref-type>
-	  </resource-env-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-name element specifies the name
-	    of a resource environment reference; its value is
-	    the environment entry name used in
-	    the Deployment Component code.  The name is a JNDI
-	    name relative to the java:comp/env context and must
-	    be unique within a Deployment Component.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="resource-env-ref-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-type element specifies the type
-	    of a resource environment reference.  It is the
-	    fully qualified name of a Java language class or
-	    interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-refType contains a declaration of a
-	  Deployment Component's reference to an external resource. It
-	  consists of an optional description, the resource manager
-	  connection factory reference name, the indication of the
-	  resource manager connection factory type expected by the
-	  Deployment Component code, the type of authentication
-	  (Application or Container), and an optional specification of
-	  the shareability of connections obtained from the resource
-	  (Shareable or Unshareable).
-
-	  Example:
-
-	  <resource-ref>
-	      <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-	      <res-type>javax.sql.DataSource</res-type>
-	      <res-auth>Container</res-auth>
-	      <res-sharing-scope>Shareable</res-sharing-scope>
-	  </resource-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="res-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-ref-name element specifies the name of a
-	    resource manager connection factory reference.
-	    The name is a JNDI name relative to the
-	    java:comp/env context.
-	    The name must be unique within a Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-type element specifies the type of the data
-	    source. The type is specified by the fully qualified
-	    Java language class or interface
-	    expected to be implemented by the data source.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-auth"
-		   type="j2ee:res-authType"/>
-
-      <xsd:element name="res-sharing-scope"
-		   type="j2ee:res-sharing-scopeType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="role-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The role-nameType designates the name of a security role.
-
-	The name must conform to the lexical rules for a token.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="run-asType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The run-asType specifies the run-as identity to be
-	used for the execution of a component. It contains an
-	optional description, and the name of a security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="j2ee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-role-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-role-refType contains the declaration of a
-	security role reference in a component's or a
-	Deployment Component's code. The declaration consists of an
-	optional description, the security role name used in the
-	code, and an optional link to a security role. If the
-	security role is not specified, the Deployer must choose an
-	appropriate security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="j2ee:role-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The value of the role-name element must be the String used
-	    as the parameter to the
-	    EJBContext.isCallerInRole(String roleName) method or the
-	    HttpServletRequest.isUserInRole(String role) method.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="role-link"
-		   type="j2ee:role-nameType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The role-link element is a reference to a defined
-	    security role. The role-link element must contain
-	    the name of one of the security roles defined in the
-	    security-role elements.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The security-roleType contains the definition of a security
-	  role. The definition consists of an optional description of the
-	  security role, and the security role name.
-
-	  Example:
-
-	      <security-role>
-	      <description>
-		  This role includes all employees who are authorized
-		  to access the employee service application.
-	      </description>
-	      <role-name>employee</role-name>
-	      </security-role>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="j2ee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="string">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a special string datatype that is defined by J2EE as
-	a base type for defining collapsed strings. When schemas
-	require trailing/leading space elimination as well as
-	collapsing the existing whitespace, this base type may be
-	used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="true-falseType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This simple type designates a boolean with only two
-	permissible values
-
-	- true
-	- false
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdBooleanType">
-	<xsd:pattern value="(true|false)"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="url-patternType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The url-patternType contains the url pattern of the mapping.
-	It must follow the rules specified in Section 11.2 of the
-	Servlet API Specification. This pattern is assumed to be in
-	URL-decoded form and must not contain CR(#xD) or LF(#xA).
-	If it contains those characters, the container must inform
-	the developer with a descriptive error message.
-	The container must preserve all characters including whitespaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdAnyURIType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:anyURI.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:anyURI">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdBooleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:boolean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:integer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:integer">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNMTOKENType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:NMTOKEN.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:NMTOKEN">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNonNegativeIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:nonNegativeInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:nonNegativeInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdPositiveIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:positiveInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:positiveInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdQNameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:QName.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:QName">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:string.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd
deleted file mode 100644
index 852191c298..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd
+++ /dev/null
@@ -1,886 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_jaxrpc_mapping_1_1.xsds	1.11 09/03/03
-
-      Based on j2ee_jaxrpc_mapping_1_0.dtd, Last updated: 09/19/2002 10:26
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	The element describes the Java mapping to a known WSDL document.
-
-	It contains the mapping between package names and XML namespaces,
-	WSDL root types and Java artifacts, and the set of mappings for
-	services.
-
-	All java-wsdl-mapping deployment descriptors must indicate the
-	schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by using the
-	version element as shown below:
-
-	    <java-wsdl-mapping 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
-	      version="1.1">
-	      ...
-	    </java-wsdl-mapping>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for J2EE
-	namespace with the following location:
-
-	http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="java-wsdl-mapping" type="j2ee:java-wsdl-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is the root of the java-wsdl-mapping deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="constructor-parameter-orderType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The constructor-parameter-order element defines the order
-	that complexType element values are applied to a Java
-	exception constructor. Element names are specified for each
-	parameter of the constructor, including element names of
-	inherited types if necessary.
-
-	Used in: exception-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="element-name"
-		   type="j2ee:string"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element-name element defines the name of a complexType
-	    element name attribute value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="exception-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The exception-mapping element defines the mapping between the
-	service specific exception types and wsdl faults and
-	SOAP headerfaults.
-
-	This element should be interpreted with respect to the
-	mapping between a method and an operation which provides the
-	mapping context.
-
-	Used in: service-endpoint-method-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="exception-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The exception-type element defines Java type of the exception.
-	    It may be a service specific exception.
-
-	    It must be a fully qualified class name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-message"
-		   type="j2ee:wsdl-messageType"/>
-      <xsd:element name="wsdl-message-part-name"
-		   type="j2ee:wsdl-message-part-nameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-            The wsdl-message-part-name element is required only
-            when the message referenced by the wsdl-message element
-            has more than one part.
-
-            This only occurs when multiple headerfaults use the
-            same message.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="constructor-parameter-order"
-		   type="j2ee:constructor-parameter-orderType"
-		   minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-wsdl-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The element describes the Java mapping to a known WSDL document.
-
-	It contains the mapping between package names and XML namespaces,
-	WSDL root types and Java artifacts, and the set of mappings for
-	services.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="package-mapping"
-		   type="j2ee:package-mappingType"
-		   minOccurs="1" maxOccurs="unbounded"/>
-      <xsd:element name="java-xml-type-mapping"
-		   type="j2ee:java-xml-type-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="exception-mapping"
-		   type="j2ee:exception-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="service-interface-mapping"
-		     type="j2ee:service-interface-mappingType"
-		     minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="service-endpoint-interface-mapping"
-		     type="j2ee:service-endpoint-interface-mappingType"
-		     minOccurs="1" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="1.1"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.1.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-xml-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The java-xml-type-mapping element contains a java-type that is the
-	fully qualified name of the Java class, primitive type, or array
-	type, QName of the XML root type or anonymous type, the WSDL type
-	scope the QName applies to and the set of variable mappings for
-	each public variable within the Java class.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="java-type"
-		   type="j2ee:java-typeType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-type element is the fully qualified class name of
-	    a Java class, primitive, or array type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <choice>
-        <xsd:element name="root-type-qname"
-		   type="j2ee:xsdQNameType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The root-type-qname identifies the WSDL QName of an XML type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="anonymous-type-qname"
-		   type="j2ee:string">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The anonymous-type-qname identifies the WSDL QName of an
-	      anonymous XML type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-      </choice>
-      <xsd:element name="qname-scope"
-		   type="j2ee:qname-scopeType"/>
-      <xsd:element name="variable-mapping"
-		   type="j2ee:variable-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-param-parts-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-param-parts-mapping element defines the mapping between a
-	Java method parameters and a wsdl-message.
-
-	Used in: service-endpoint-method-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="param-position"
-		   type="j2ee:xsdNonNegativeIntegerType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-position element defines the position of a
-	    parameter within a Java method.  It must be an integer
-	    starting from 0.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="param-type"
-		   type="j2ee:java-typeType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-type element defines the fully qualified
-	    class name of a Java class, primitive, or array type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-message-mapping"
-		   type="j2ee:wsdl-message-mappingType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="package-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The package-mapping indicates the mapping between java-package-name
-	and XML namespace in the WSDL document.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="package-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The package-type indicates the Java package name. It must be a fully
-	    qualified package name, even though the XML schema type is
-	    fully-qualified-classType.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="namespaceURI"
-		   type="j2ee:xsdAnyURIType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The namespaceURI element indicates a URI.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="parameter-modeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The parameter-mode element defines the mode of the parameter.
-	It can have only three values, IN, OUT, INOUT.
-
-	Used in: java-xml-type-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="IN"/>
-	<xsd:enumeration value="OUT"/>
-	<xsd:enumeration value="INOUT"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-mapping defines the mapping of the WSDL port name attribute
-	to the Java name used to generate the Generated Service Interface
-	method get{java-name}.
-
-	Used in: service-interface-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="port-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-mapping defines the mapping of the WSDL port name
-	    attribute to the Java name used to generate the Generated
-	    Service Interface method get{java-name}.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="java-port-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-port-name element is the string to use as the port
-	    name in Java.  It is used in generating the Generated
-	    Service Interface method get{java-port-name}.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="qname-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The qname-scope elements scopes the reference of a QName to the WSDL
-	element type it applies to. The value of qname-scope may be
-	simpleType, complexType, or element.
-
-	Used in: java-xml-type-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="simpleType"/>
-	<xsd:enumeration value="complexType"/>
-	<xsd:enumeration value="element"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-endpoint-interface-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-endpoint-interface-mapping defines a tuple
-	to specify Service Endpoint Interfaces to
-	WSDL port types and WSDL bindings.
-
-	An interface may be mapped to a port-type and binding multiple
-	times. This happens rarely.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="service-endpoint-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint-interface element defines the Java
-	    type for the endpoint interface. The name must be a fully
-	    qualified class name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-port-type"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-port-type element defines the wsdl port type
-	    by a QNAME which uniquely identifies  the port type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-binding"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-binding element defines the wsdl binding
-	    by a QNAME which uniquely identifies  the binding.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-endpoint-method-mapping"
-		   type="j2ee:service-endpoint-method-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-endpoint-method-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-endpoint-method-mapping element defines the mapping of
-	Java methods to operations (which are not uniquely qualified by
-	qnames).
-
-	The wsdl-operation should be interpreted with respect to the
-	portType and binding in which this definition is embedded within.
-	See the definitions for service-endpoint-interface-mapping and
-	service-interface-mapping to acquire the proper context.  The
-	wrapped-element indicator should only be specified when a WSDL
-	message wraps an element type.  The wsdl-return-value-mapping is
-	not specified for one-way operations.
-
-	Used in: service-endpoint-interface-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="java-method-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-method-name element defines the name of a Java method
-	    within an interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-operation"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-operation element defines an operation within a WSDL
-	    document.  It must be interpreted with respect to a port type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wrapped-element"
-		   type="j2ee:emptyType"
-		   minOccurs="0"
-		   maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wrapped-element element is defined when a WSDL message
-	    with a single part is used to wrap an element type and the
-	    element's name matches the operation name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="method-param-parts-mapping"
-		   type="j2ee:method-param-parts-mappingType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="wsdl-return-value-mapping"
-		   type="j2ee:wsdl-return-value-mappingType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-interface-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-interface-mapping element defines how a Java type for
-	the service interface maps to a WSDL service.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="service-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-interface element defines the Java type for the service.
-	    For static services, it is javax.xml.rpc.Service interface. For
-	    generated service, it would be the generated interface name.
-
-	    The name must be a fully qualified class name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-service-name"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-service-name element defines the wsdl service name
-	    by a QNAME which uniquely identifies  the service.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-mapping"
-		   type="j2ee:port-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="variable-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The variable-mapping element defines the correlation between a
-	Java class data member or JavaBeans property to an XML element
-	or attribute name of an XML root type. If the data-member
-	element is present, the Java variable name is a public data
-	member.  If data-member	is not present, the Java variable name
-	is a JavaBeans property.
-
-	Used in: java-xml-type-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="java-variable-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-variable-name defines the name of a public data member or
-	    JavaBeans property within a Java class.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="data-member"
-		   type="j2ee:emptyType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The data-member element is a boolean indicator that a Java
-	    variable is a public data member and not a JavaBeans property.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:choice>
-        <xsd:element name="xml-attribute-name"
-		     type="j2ee:string">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The xml-attribute-name element defines name attribute value
-	      of a WSDL attribute element within a root type.  The value
-	      of an xml-attribute-name element must match the value of
-	      the ref attribute if mapping an attribute reference.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="xml-element-name"
-		     type="j2ee:string">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The xml-element-name element defines name attribute value of
-	      a WSDL element within a root type.  The value of an
-	      xml-element-name element must match the value of the ref
-	      attribute if mapping an element reference.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-        </xsd:element>
-        <xsd:element name="xml-wildcard"
-		     type="j2ee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The xml-wildcard element associates the variable-mapping with
-	      an xsd:any element within a root type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-message-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The wsdl-message-mapping element defines the mapping to a
-	specific message and its part. Together they define uniquely
-	the mapping for a specific parameter. Parts within a message
-	context are uniquely identified with their names.
-
-	The parameter-mode is defined by the mapping to indicate
-	whether the mapping will be IN, OUT, or INOUT..  The presence
-	of the soap-header element indicates that the parameter is
-	mapped to a soap header only.  When absent, it means that the
-	wsdl-message is mapped to a Java parameter. The soap headers
-	are interpreted in the order they are provided in the mapping.
-
-	Used in: method-param-parts-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="wsdl-message"
-		   type="j2ee:wsdl-messageType"/>
-      <xsd:element name="wsdl-message-part-name"
-		   type="j2ee:wsdl-message-part-nameType"/>
-      <xsd:element name="parameter-mode"
-		   type="j2ee:parameter-modeType"/>
-      <xsd:element name="soap-header"
-		   type="j2ee:emptyType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-header element is a boolean element indicating that
-	    a parameter is mapped to a SOAP header.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-message-part-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Interpretation of the wsdl-message-part-name element depends on
-	whether or not wrapped-element has been defined in the
-	service-endpoint-method-mapping.  If wrapped-element is not
-	specified, wsdl-message-part-name defines a WSDL message part. It
-	should always be interpreted with respect to a wsdl-message
-	element. If wrapped-element is specified, wsdl-message-part-name
-	refers to an element name of the element type.
-
-	Used in: wsdl-message-mapping, wsdl-return-value-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-messageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The wsdl-message element defines a WSDL message by a QNAME.
-
-	Used in: wsdl-message-mapping, wsdl-return-value-mapping,
-	exception-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdQNameType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-return-value-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The wsdl-return-value-mapping  element defines the mapping for the
-	method's return value. It defines the mapping to a specific message
-	and its part.  Together they define uniquely the mapping for a
-	specific parameter. Parts within a message context are uniquely
-	identified with their names. The wsdl-message-part-name is not
-	specified if there is no return value or OUT parameters.
-
-	Used in: service-endpoint-method-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="method-return-value"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The method-return-value  element defines a fully qualified
-	    class name or void type for the method's return value
-	    type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-message"
-		   type="j2ee:wsdl-messageType"/>
-      <xsd:element name="wsdl-message-part-name"
-		   type="j2ee:wsdl-message-part-nameType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_1_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_1_1.xsd
deleted file mode 100644
index 7e2a7980a2..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_1_1.xsd
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_web_services_1_1.xsds	1.11 02/11/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the J2EE Application
-	Server and the dependencies they have on container resources and
-	services.  The deployment descriptor must be named
-	"META-INF/webservices.xml" in the web services' jar file.
-
-	Used in: webservices.xml
-
-	All webservices deployment descriptors must indicate the
-	webservices schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by using the version
-	element as shown below:
-
-	    <webservices 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://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
-	      version="1.1">
-	      ...
-	    </webservices>
-
-	The instance documents may indicate the published version of the
-	schema using the xsi:schemaLocation attribute for the J2EE
-	namespace with the following location:
-
-	http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="webservices" type="j2ee:webservicesType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the J2EE Application Server
-	and the dependencies they have on container resources and services.
-
-	Used in: webservices.xml
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="webservice-description-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The webservice-description-name identifies the collection of
-	  port-components associated with a WSDL file and JAX-RPC mapping. The
-	  name must be unique within the deployment descriptor.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:webservice-description"/>
-      <xsd:field xpath="j2ee:webservice-description-name"/>
-    </xsd:key>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-componentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component element associates a WSDL port with a web service
-	interface and implementation.  It defines the name of the port as a
-	component, optional description, optional display name, optional iconic
-	representations, WSDL port QName, Service Endpoint Interface, Service
-	Implementation Bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="j2ee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="j2ee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="port-component-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The port-component-name element specifies a port component's
-	      name.  This name is assigned by the module producer to name
-	      the service implementation bean in the module's deployment
-	      descriptor. The name must be unique among the port component
-	      names defined in the same module.
-
-	      Used in: port-component
-
-	      Example:
-		      <port-component-name>EmployeeService
-		      </port-component-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-port"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name space and local name part of the WSDL port QName.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-endpoint-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The service-endpoint-interface element contains the
-	      fully-qualified name of the port component's Service Endpoint
-	      Interface.
-
-	      Used in: port-component
-
-	      Example:
-		      <remote>com.wombat.empl.EmployeeService</remote>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-impl-bean"
-		   type="j2ee:service-impl-beanType"/>
-
-      <xsd:element name="handler"
-		   type="j2ee:port-component_handlerType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique within the
-	    module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="j2ee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="j2ee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed by the
-	    handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="soap-role"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that the
-	    Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-impl-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-impl-bean element defines the web service implementation.
-	A service implementation can be an EJB bean class or JAX-RPC web
-	component.  Existing EJB implementations are exposed as a web service
-	using an ejb-link.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="ejb-link"
-		   type="j2ee:ejb-linkType"/>
-      <xsd:element name="servlet-link"
-		   type="j2ee:servlet-linkType"/>
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The servlet-link element is used in the service-impl-bean element
-	  to specify that a Service Implementation Bean is defined as a
-	  JAX-RPC Service Endpoint.
-
-	  The value of the servlet-link element must be the servlet-name of
-	  a JAX-RPC Service Endpoint in the same WAR file.
-
-	  Used in: service-impl-bean
-
-	  Example:
-		  <servlet-link>StockQuoteService</servlet-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservice-descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservice-description element defines a WSDL document file
-	and the set of Port components associated with the WSDL ports
-	defined in the WSDL document.  There may be multiple
-	webservice-descriptions defined within a module.
-
-	All WSDL file ports must have a corresponding port-component element
-	defined.
-
-	Used in: webservices
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="j2ee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="j2ee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="webservice-description-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The webservice-description-name identifies the collection of
-	    port-components associated with a WSDL file and JAX-RPC
-	    mapping. The name must be unique within the deployment descriptor.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-file"
-		   type="j2ee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the name of a WSDL file in the
-	    module.  The file name is a relative path within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="j2ee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-component"
-		   type="j2ee:port-componentType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:handler"/>
-	  <xsd:field xpath="j2ee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservicesType">
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="webservice-description"
-		   type="j2ee:webservice-descriptionType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	      <![CDATA[
-
-		The port-component-name element specifies a port
-		component's name.  This name is assigned by the module
-		producer to name the service implementation bean in the
-		module's deployment descriptor. The name must be unique
-		among the port component names defined in the same module.
-
-		Used in: port-component
-
-		Example:
-			<port-component-name>EmployeeService
-			</port-component-name>
-
-		]]>
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:port-component"/>
-	  <xsd:field xpath="j2ee:port-component-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="1.1"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.1.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_client_1_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_client_1_1.xsd
deleted file mode 100644
index 454a554528..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_client_1_1.xsd
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_web_services_client_1_1.xsds	1.10 02/11/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component-ref element declares a client dependency
-	on the container for resolving a Service Endpoint Interface
-	to a WSDL port. It optionally associates the Service Endpoint
-	Interface with a particular port-component. This is only used
-	by the container for a Service.getPort(Class) method call.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="service-endpoint-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint-interface element defines a fully qualified
-	    Java class that represents the Service Endpoint Interface of a
-	    WSDL port.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-link"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-link element links a port-component-ref
-	    to a specific port-component required to be made available
-	    by a service reference.
-
-	    The value of a port-component-link must be the
-	    port-component-name of a port-component in the same module
-	    or another module in the same application unit. The syntax
-	    for specification follows the syntax defined for ejb-link
-	    in the EJB 2.0 specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="service-refGroup">
-    <xsd:sequence>
-      <xsd:element name="service-ref"
-		   type="j2ee:service-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:key name="service-ref_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:handler"/>
-	  <xsd:field xpath="j2ee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-ref element declares a reference to a Web
-	service. It contains optional description, display name and
-	icons, a declaration of the required Service interface,
-	an optional WSDL document location, an optional set
-	of JAX-RPC mappings, an optional QName for the service element,
-	an optional set of Service Endpoint Interfaces to be resolved
-	by the container to a WSDL port, and an optional set of handlers.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="service-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-ref-name element declares logical name that the
-	    components in the module use to look up the Web service. It
-	    is recommended that all service reference names start with
-	    "service/".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-interface element declares the fully qualified class
-	    name of the JAX-RPC Service interface the client depends on.
-	    In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	    generated Service Interface class may also be specified.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="wsdl-file"
-		   type="j2ee:xsdAnyURIType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the URI location of a WSDL
-	    file. The location is relative to the root of the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="j2ee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module file.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-qname"
-		   type="j2ee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-qname element declares the specific WSDL service
-	    element that is being refered to.  It is not specified if no
-	    wsdl-file is declared.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-ref"
-		   type="j2ee:port-component-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-ref element declares a client dependency
-	    on the container for resolving a Service Endpoint Interface
-	    to a WSDL port. It optionally associates the Service Endpoint
-	    Interface with a particular port-component. This is only used
-	    by the container for a Service.getPort(Class) method call.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="handler"
-		   type="j2ee:service-ref_handlerType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Declares the handler for a port-component. Handlers can
-	    access the init-param name/value pairs using the
-	    HandlerInfo interface. If port-name is not specified, the
-	    handler is assumed to be associated with all ports of the
-	    service.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface. If
-	port-name is not specified, the handler is assumed to be associated
-	with all ports of the service.
-
-	Used in: service-ref
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique
-	    within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler
-	    implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="j2ee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="j2ee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed
-	    by the handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="soap-role"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that
-	    the Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-name"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-name element defines the WSDL port-name that a
-	    handler should be associated with.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_5.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_5.xsd
deleted file mode 100644
index db1018188e..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_5.xsd
+++ /dev/null
@@ -1,2096 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/javaee"
-     xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="5">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)javaee_5.xsds	1.65 06/02/17
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following definitions that appear in the common
-shareable schema(s) of J2EE deployment descriptors should be
-interpreted with respect to the context they are included:
-
-Deployment Component may indicate one of the following:
-    j2ee application;
-    application client;
-    web application;
-    enterprise bean;
-    resource adapter;
-
-Deployment File may indicate one of the following:
-    ear file;
-    war file;
-    jar file;
-    rar file;
-
-</xsd:documentation>
-</xsd:annotation>
-
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-	      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-  <xsd:include schemaLocation="javaee_web_services_client_1_2.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:group name="descriptionGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained description related
-	elements consistent across Java EE deployment descriptors.
-
-	All elements may occur multiple times with different languages,
-	to support localization of the content.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The description type is used by a description element to
-	provide text describing the parent element.  The elements
-	that use this type should include any information that the
-	Deployment Component's Deployment File file producer wants
-	to provide to the consumer of the Deployment Component's
-	Deployment File (i.e., to the Deployer). Typically, the
-	tools used by such a Deployment File consumer will display
-	the description when processing the parent element that
-	contains the description.
-
-	The lang attribute defines the language that the
-	description is provided in. The default value is "en" (English).
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:xsdStringType">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="dewey-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines a dewey decimal that is used
-	to describe versions of documents.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="\.?[0-9]+(\.[0-9]+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="display-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The display-name type contains a short name that is intended
-	  to be displayed by tools. It is used by display-name
-	  elements.  The display name need not be unique.
-
-	  Example:
-
-	  ...
-	     <display-name xml:lang="en">
-	       Employee Self Service
-	     </display-name>
-
-	  The value of the xml:lang attribute is "en" (English) by default.
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:string">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-linkType is used by ejb-link
-	  elements in the ejb-ref or ejb-local-ref elements to specify
-	  that an EJB reference is linked to enterprise bean.
-
-	  The value of the ejb-link element must be the ejb-name of an
-	  enterprise bean in the same ejb-jar file or in another ejb-jar
-	  file in the same Java EE application unit.
-
-	  Alternatively, the name in the ejb-link element may be
-	  composed of a path name specifying the ejb-jar containing the
-	  referenced enterprise bean with the ejb-name of the target
-	  bean appended and separated from the path name by "#".  The
-	  path name is relative to the Deployment File containing
-	  Deployment Component that is referencing the enterprise
-	  bean.  This allows multiple enterprise beans with the same
-	  ejb-name to be uniquely identified.
-
-	  Examples:
-
-	      <ejb-link>EmployeeRecord</ejb-link>
-
-	      <ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-local-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-local-refType is used by ejb-local-ref elements for
-	the declaration of a reference to an enterprise bean's local
-	home or to the local business interface of a 3.0 bean.
-        The declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of the Deployment
-	      Component that's referencing the enterprise bean.
-	    - the optional expected type of the referenced enterprise bean
-	    - the optional expected local interface of the referenced
-              enterprise bean or the local business interface of the
-              referenced enterprise bean.
-	    - the optional expected local home interface of the referenced
-              enterprise bean. Not applicable if this ejb-local-ref refers
-              to the local business interface of a 3.0 bean.
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-            - optional elements to define injection of the named enterprise
-              bean into a component field or property.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="javaee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="javaee:ejb-ref-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="javaee:local-homeType"
-                   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="javaee:localType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-link"
-		   type="javaee:ejb-linkType"
-		   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the
-	  Deployment Component's environment and is relative to the
-	  java:comp/env context.  The name must be unique within the
-	  Deployment Component.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	  Example:
-
-	  <ejb-ref-name>ejb/Payroll</ejb-ref-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:jndi-nameType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-ref-typeType contains the expected type of the
-	referenced enterprise bean.
-
-	The ejb-ref-type designates a value
-	that must be one of the following:
-
-	    Entity
-	    Session
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Entity"/>
-	<xsd:enumeration value="Session"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-refType is used by ejb-ref elements for the
-	declaration of a reference to an enterprise bean's home or
-        to the remote business interface of a 3.0 bean.
-	The declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of
-	      the Deployment Component that's referencing the enterprise
-	      bean.
-	    - the optional expected type of the referenced enterprise bean
-            - the optional remote interface of the referenced enterprise bean
-              or the remote business interface of the referenced enterprise
-              bean
-	    - the optional expected home interface of the referenced
-              enterprise bean.  Not applicable if this ejb-ref
-              refers to the remote business interface of a 3.0 bean.
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-            - optional elements to define injection of the named enterprise
-              bean into a component field or property
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="javaee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="javaee:ejb-ref-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="javaee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="javaee:remoteType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-link"
-		   type="javaee:ejb-linkType"
-		   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="emptyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is used to designate an empty
-	element when used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entry-type-valuesType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  This type contains the fully-qualified Java type of the
-	  environment entry value that is expected by the
-	  application's code.
-
-	  The following are the legal values of env-entry-type-valuesType:
-
-	      java.lang.Boolean
-	      java.lang.Byte
-	      java.lang.Character
-	      java.lang.String
-	      java.lang.Short
-	      java.lang.Integer
-	      java.lang.Long
-	      java.lang.Float
-	      java.lang.Double
-
-	  Example:
-
-	  <env-entry-type>java.lang.Boolean</env-entry-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="java.lang.Boolean"/>
-	<xsd:enumeration value="java.lang.Byte"/>
-	<xsd:enumeration value="java.lang.Character"/>
-	<xsd:enumeration value="java.lang.String"/>
-	<xsd:enumeration value="java.lang.Short"/>
-	<xsd:enumeration value="java.lang.Integer"/>
-	<xsd:enumeration value="java.lang.Long"/>
-	<xsd:enumeration value="java.lang.Float"/>
-	<xsd:enumeration value="java.lang.Double"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The env-entryType is used to declare an application's
-	environment entry. The declaration consists of an optional
-	description, the name of the environment entry, a type
-	(optional if the value is injected, otherwise required), and
-	an optional value.
-
-	It also includes optional elements to define injection of
-	the named resource into fields or JavaBeans properties.
-
-	If a value is not specified and injection is requested,
-	no injection will occur and no entry of the specified name
-	will be created.  This allows an initial value to be
-	specified in the source code without being incorrectly
-	changed when no override has been specified.
-
-	If a value is not specified and no injection is requested,
-	a value must be supplied during deployment.
-
-	This type is used by env-entry elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="env-entry-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-name element contains the name of a
-	      Deployment Component's environment entry.  The name
-	      is a JNDI name relative to the java:comp/env
-	      context.  The name must be unique within a
-	      Deployment Component. The uniqueness
-	      constraints must be defined within the declared
-	      context.
-
-	      Example:
-
-	      <env-entry-name>minAmount</env-entry-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="env-entry-type"
-		   type="javaee:env-entry-type-valuesType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-type element contains the Java language
-	      type of the environment entry.  If an injection target
-	      is specified for the environment entry, the type may
-	      be omitted, or must match the type of the injection
-	      target.  If no injection target is specified, the type
-	      is required.
-
-	      Example:
-
-	      <env-entry-type>java.lang.Integer</env-entry-type>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="env-entry-value"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-value designates the value of a
-	      Deployment Component's environment entry. The value
-	      must be a String that is valid for the
-	      constructor of the specified type that takes a
-	      single String parameter, or for java.lang.Character,
-	      a single character.
-
-	      Example:
-
-	      <env-entry-value>100.00</env-entry-value>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="fully-qualified-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate the name of a
-	Java class or interface.  The name is in the form of a
-	"binary name", as defined in the JLS.  This is the form
-	of name used in Class.forName().  Tools that need the
-	canonical name (the name used in source code) will need
-	to convert this binary name to the canonical name.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="generic-booleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines four different values which can designate
-	boolean values. This includes values yes and no which are
-	not designated by xsd:boolean
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="true"/>
-	<xsd:enumeration value="false"/>
-	<xsd:enumeration value="yes"/>
-	<xsd:enumeration value="no"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The homeType defines the fully-qualified name of
-	  an enterprise bean's home interface.
-
-	  Example:
-
-	      <home>com.aardvark.payroll.PayrollHome</home>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="iconType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The icon type contains small-icon and large-icon elements
-	that specify the file names for small and large GIF, JPEG,
-	or PNG icon images used to represent the parent element in a
-	GUI tool.
-
-	The xml:lang attribute defines the language that the
-	icon file names are provided in. Its value is "en" (English)
-	by default.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="small-icon" type="javaee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The small-icon element contains the name of a file
-	      containing a small (16 x 16) icon image. The file
-	      name is a relative path within the Deployment
-	      Component's Deployment File.
-
-	      The image may be in the GIF, JPEG, or PNG format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <small-icon>employee-service-icon16x16.jpg</small-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="large-icon" type="javaee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The large-icon element contains the name of a file
-	      containing a large
-	      (32 x 32) icon image. The file name is a relative
-	      path within the Deployment Component's Deployment
-	      File.
-
-	      The image may be in the GIF, JPEG, or PNG format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <large-icon>employee-service-icon32x32.jpg</large-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-
-    <xsd:attribute ref="xml:lang"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="injection-targetType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	An injection target specifies a class and a name within
-	that class into which a resource should be injected.
-
-	The injection target class specifies the fully qualified
-	class name that is the target of the injection.  The
-	Java EE specifications describe which classes can be an
-	injection target.
-
-	The injection target name specifies the target within
-	the specified class.  The target is first looked for as a
-	JavaBeans property name.  If not found, the target is
-	looked for as a field name.
-
-	The specified resource will be injected into the target
-	during initialization of the class by either calling the
-	set method for the target property or by setting a value
-	into the named field.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="injection-target-class"
-		   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="injection-target-name"
-		   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-identifierType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The java-identifierType defines a Java identifier.
-	The users of this type should further verify that
-	the content does not contain Java reserved keywords.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a generic type that designates a Java primitive
-	type or a fully qualified name of a Java interface/type,
-	or an array of such types.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:pattern value="[^\p{Z}]*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jndi-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jndi-nameType type designates a JNDI name in the
-	Deployment Component's environment and is relative to the
-	java:comp/env context.  A JNDI name must be unique within the
-	Deployment Component.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="jndiEnvironmentRefsGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained JNDI environment
-	reference elements consistent across Java EE deployment descriptors.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="env-entry"
-		   type="javaee:env-entryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-		   type="javaee:ejb-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-local-ref"
-		   type="javaee:ejb-local-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-		   type="javaee:resource-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-		   type="javaee:resource-env-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-		   type="javaee:message-destination-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="persistence-context-ref"
-		   type="javaee:persistence-context-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref"
-		   type="javaee:persistence-unit-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="post-construct"
-		   type="javaee:lifecycle-callbackType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="pre-destroy"
-		   type="javaee:lifecycle-callbackType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="lifecycle-callbackType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The lifecycle-callback type specifies a method on a
-	class to be called when a lifecycle event occurs.
-	Note that each class may have only one lifecycle callback
-        method for any given event and that the method may not
-	be overloaded.
-
-        If the lifefycle-callback-class element is missing then
-        the class defining the callback is assumed to be the
-        component class in scope at the place in the descriptor
-        in which the callback definition appears.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="lifecycle-callback-class"
-		   type="javaee:fully-qualified-classType"
-                   minOccurs="0"/>
-      <xsd:element name="lifecycle-callback-method"
-		   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="listenerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The listenerType indicates the deployment properties for a web
-	application listener bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="listener-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The listener-class element declares a class in the
-	    application must be registered as a web
-	    application listener bean. The value is the fully
-	    qualified classname of the listener class.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="local-homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The local-homeType defines the fully-qualified
-	name of an enterprise bean's local home interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="localType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The localType defines the fully-qualified name of an
-	enterprise bean's local interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-linkType is used to link a message
-	destination reference or message-driven bean to a message
-	destination.
-
-	The Assembler sets the value to reflect the flow of messages
-	between producers and consumers in the application.
-
-	The value must be the message-destination-name of a message
-	destination in the same Deployment File or in another
-	Deployment File in the same Java EE application unit.
-
-	Alternatively, the value may be composed of a path name
-	specifying a Deployment File containing the referenced
-	message destination with the message-destination-name of the
-	destination appended and separated from the path name by
-	"#". The path name is relative to the Deployment File
-	containing Deployment Component that is referencing the
-	message destination.  This allows multiple message
-	destinations with the same name to be uniquely identified.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-ref element contains a declaration
-	  of Deployment Component's reference to a message destination
-	  associated with a resource in Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the message destination reference name
-		  - an optional message destination type
-		  - an optional specification as to whether
-		    the destination is used for
-		    consuming or producing messages, or both.
-		    if not specified, "both" is assumed.
-		  - an optional link to the message destination
-		  - optional injection targets
-
-	  The message destination type must be supplied unless an
-	  injection target is specified, in which case the type
-	  of the target is used.  If both are specified, the type
-	  must be assignment compatible with the type of the injection
-	  target.
-
-	  Examples:
-
-	  <message-destination-ref>
-		  <message-destination-ref-name>jms/StockQueue
-		  </message-destination-ref-name>
-		  <message-destination-type>javax.jms.Queue
-		  </message-destination-type>
-		  <message-destination-usage>Consumes
-		  </message-destination-usage>
-		  <message-destination-link>CorporateStocks
-		  </message-destination-link>
-	  </message-destination-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-ref-name element specifies
-	    the name of a message destination reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context and must be
-	    unique within an ejb-jar (for enterprise beans) or a
-	    Deployment File (for others).
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination-type"
-		   type="javaee:message-destination-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-usage"
-		   type="javaee:message-destination-usageType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-		   type="javaee:message-destination-linkType"
-		   minOccurs="0"/>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-typeType specifies the type of
-	  the destination. The type is specified by the Java interface
-	  expected to be implemented by the destination.
-
-	  Example:
-
-	    <message-destination-type>javax.jms.Queue
-	    </message-destination-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-usageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-usageType specifies the use of the
-	message destination indicated by the reference.  The value
-	indicates whether messages are consumed from the message
-	destination, produced for the destination, or both.  The
-	Assembler makes use of this information in linking producers
-	of a destination with its consumers.
-
-	The value of the message-destination-usage element must be
-	one of the following:
-	    Consumes
-	    Produces
-	    ConsumesProduces
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Consumes"/>
-	<xsd:enumeration value="Produces"/>
-	<xsd:enumeration value="ConsumesProduces"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destinationType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destinationType specifies a message
-	  destination. The logical destination described by this
-	  element is mapped to a physical destination by the Deployer.
-
-	  The message destination element contains:
-
-		  - an optional description
-		  - an optional display-name
-		  - an optional icon
-		  - a message destination name which must be unique
-		    among message destination names within the same
-		    Deployment File.
-		  - an optional mapped name
-
-	  Example:
-
-	  <message-destination>
-		  <message-destination-name>CorporateStocks
-		  </message-destination-name>
-	  </message-destination>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="message-destination-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-name element specifies a
-	    name for a message destination.  This name must be
-	    unique among the names of message destinations
-	    within the Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      A product specific name that this message destination
-	      should be mapped to.  Each message-destination-ref
-	      element that references this message destination will
-	      define a name in the namespace of the referencing
-	      component.  (It's a name in the JNDI java:comp/env
-	      namespace.)  Many application servers provide a way to
-	      map these local names to names of resources known to the
-	      application server.  This mapped name is often a global
-	      JNDI name, but may be a name of any form.  Each of the
-	      local names should be mapped to this same global name.
-
-	      Application servers are not required to support any
-	      particular form or type of mapped name, nor the ability
-	      to use mapped names.  The mapped name is
-	      product-dependent and often installation-dependent.  No
-	      use of a mapped name is portable.
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="param-valueType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is a general type that can be used to declare
-	parameter/value lists.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="param-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-name element contains the name of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="param-value"
-		   type="javaee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-value element contains the value of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate either a relative
-	path or an absolute path starting with a "/".
-
-	In elements that specify a pathname to a file within the
-	same Deployment File, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the Deployment File's namespace.  Absolute filenames (i.e.,
-	those starting with "/") also specify names in the root of
-	the Deployment File's namespace.  In general, relative names
-	are preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-context-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The persistence-context-ref element contains a declaration
-	  of Deployment Component's reference to a persistence context
-	  associated within a Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the persistence context reference name
-		  - an optional persistence unit name.  If not specified,
-                    the default persistence unit is assumed.
-		  - an optional specification as to whether
-		    the persistence context type is Transaction or
-		    Extended.  If not specified, Transaction is assumed.
-                  - an optional list of persistence properties
-		  - optional injection targets
-
-	  Examples:
-
-            <persistence-context-ref>
-              <persistence-context-ref-name>myPersistenceContext
-              </persistence-context-ref-name>
-            </persistence-context-ref>
-
-            <persistence-context-ref>
-              <persistence-context-ref-name>myPersistenceContext
-                </persistence-context-ref-name>
-              <persistence-unit-name>PersistenceUnit1
-                </persistence-unit-name>
-              <persistence-context-type>Extended</persistence-context-type>
-            </persistence-context-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-context-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The persistence-context-ref-name element specifies
-	    the name of a persistence context reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="persistence-unit-name"
-		   type="javaee:string"
-		   minOccurs="0">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-            The Application Assembler(or BeanProvider) may use the
-            following syntax to avoid the need to rename persistence
-            units to have unique names within a Java EE application.
-
-            The Application Assembler specifies the pathname of the
-            root of the persistence.xml file for the referenced
-            persistence unit and appends the name of the persistence
-            unit separated from the pathname by #. The pathname is
-            relative to the referencing application component jar file.
-            In this manner, multiple persistence units with the same
-            persistence unit name may be uniquely identified when the
-            Application Assembler cannot change persistence unit names.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="persistence-context-type"
-		   type="javaee:persistence-context-typeType"
-		   minOccurs="0"/>
-
-      <xsd:element name="persistence-property"
-		   type="javaee:propertyType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-            Used to specify properties for the container or persistence
-            provider.  Vendor-specific properties may be included in
-            the set of properties.  Properties that are not recognized
-            by a vendor must be ignored.  Entries that make use of the
-            namespace javax.persistence and its subnamespaces must not
-            be used for vendor-specific properties.  The namespace
-            javax.persistence is reserved for use by the specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-context-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The persistence-context-typeType specifies the transactional
-	nature of a persistence context reference.
-
-	The value of the persistence-context-type element must be
-	one of the following:
-	    Transaction
-            Extended
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Transaction"/>
-	<xsd:enumeration value="Extended"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The persistence-unit-ref element contains a declaration
-	  of Deployment Component's reference to a persistence unit
-	  associated within a Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the persistence unit reference name
-		  - an optional persistence unit name.  If not specified,
-                    the default persistence unit is assumed.
-		  - optional injection targets
-
-	  Examples:
-
-            <persistence-unit-ref>
-              <persistence-unit-ref-name>myPersistenceUnit
-              </persistence-unit-ref-name>
-            </persistence-unit-ref>
-
-            <persistence-unit-ref>
-              <persistence-unit-ref-name>myPersistenceUnit
-                </persistence-unit-ref-name>
-              <persistence-unit-name>PersistenceUnit1
-                </persistence-unit-name>
-            </persistence-unit-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The persistence-unit-ref-name element specifies
-	    the name of a persistence unit reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="persistence-unit-name"
-		   type="javaee:string"
-		   minOccurs="0">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-            The Application Assembler(or BeanProvider) may use the
-            following syntax to avoid the need to rename persistence
-            units to have unique names within a Java EE application.
-
-            The Application Assembler specifies the pathname of the
-            root of the persistence.xml file for the referenced
-            persistence unit and appends the name of the persistence
-            unit separated from the pathname by #. The pathname is
-            relative to the referencing application component jar file.
-            In this manner, multiple persistence units with the same
-            persistence unit name may be uniquely identified when the
-            Application Assembler cannot change persistence unit names.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Specifies a name/value pair.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="name"
-		   type="javaee:xsdStringType">
-      </xsd:element>
-      <xsd:element name="value"
-		   type="javaee:xsdStringType">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remoteType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The remote element contains the fully-qualified name
-	  of the enterprise bean's remote interface.
-
-	  Example:
-
-	      <remote>com.wombat.empl.EmployeeService</remote>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-authType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-authType specifies whether the Deployment Component
-	code signs on programmatically to the resource manager, or
-	whether the Container will sign on to the resource manager
-	on behalf of the Deployment Component. In the latter case,
-	the Container uses information that is supplied by the
-	Deployer.
-
-	The value must be one of the two following:
-
-	    Application
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Application"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-sharing-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-sharing-scope type specifies whether connections
-	obtained through the given resource manager connection
-	factory reference can be shared. The value, if specified,
-	must be one of the two following:
-
-	    Shareable
-	    Unshareable
-
-	The default value is Shareable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Shareable"/>
-	<xsd:enumeration value="Unshareable"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-env-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-env-refType is used to define
-	  resource-env-type elements.  It contains a declaration of a
-	  Deployment Component's reference to an administered object
-	  associated with a resource in the Deployment Component's
-	  environment.  It consists of an optional description, the
-	  resource environment reference name, and an optional
-	  indication of the resource environment reference type
-	  expected by the Deployment Component code.
-
-	  It also includes optional elements to define injection of
-	  the named resource into fields or JavaBeans properties.
-
-	  The resource environment type must be supplied unless an
-	  injection target is specified, in which case the type
-	  of the target is used.  If both are specified, the type
-	  must be assignment compatible with the type of the injection
-	  target.
-
-	  Example:
-
-	  <resource-env-ref>
-	      <resource-env-ref-name>jms/StockQueue
-	      </resource-env-ref-name>
-	      <resource-env-ref-type>javax.jms.Queue
-	      </resource-env-ref-type>
-	  </resource-env-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-name element specifies the name
-	    of a resource environment reference; its value is
-	    the environment entry name used in
-	    the Deployment Component code.  The name is a JNDI
-	    name relative to the java:comp/env context and must
-	    be unique within a Deployment Component.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="resource-env-ref-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-type element specifies the type
-	    of a resource environment reference.  It is the
-	    fully qualified name of a Java language class or
-	    interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-refType contains a declaration of a
-	  Deployment Component's reference to an external resource. It
-	  consists of an optional description, the resource manager
-	  connection factory reference name, an optional indication of
-	  the resource manager connection factory type expected by the
-	  Deployment Component code, an optional type of authentication
-	  (Application or Container), and an optional specification of
-	  the shareability of connections obtained from the resource
-	  (Shareable or Unshareable).
-
-	  It also includes optional elements to define injection of
-	  the named resource into fields or JavaBeans properties.
-
-	  The connection factory type must be supplied unless an
-	  injection target is specified, in which case the type
-	  of the target is used.  If both are specified, the type
-	  must be assignment compatible with the type of the injection
-	  target.
-
-	  Example:
-
-	  <resource-ref>
-	      <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-	      <res-type>javax.sql.DataSource</res-type>
-	      <res-auth>Container</res-auth>
-	      <res-sharing-scope>Shareable</res-sharing-scope>
-	  </resource-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="res-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-ref-name element specifies the name of a
-	    resource manager connection factory reference.
-	    The name is a JNDI name relative to the
-	    java:comp/env context.
-	    The name must be unique within a Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-type element specifies the type of the data
-	    source. The type is specified by the fully qualified
-	    Java language class or interface
-	    expected to be implemented by the data source.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-auth"
-		   type="javaee:res-authType"
-		   minOccurs="0"/>
-
-      <xsd:element name="res-sharing-scope"
-		   type="javaee:res-sharing-scopeType"
-		   minOccurs="0"/>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="resourceGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group collects elements that are common to all the
-	JNDI resource elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      A product specific name that this resource should be
-	      mapped to.  The name of this resource, as defined by the
-	      resource's name element or defaulted, is a name that is
-	      local to the application component using the resource.
-	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	      application servers provide a way to map these local
-	      names to names of resources known to the application
-	      server.  This mapped name is often a global JNDI name,
-	      but may be a name of any form.
-
-	      Application servers are not required to support any
-	      particular form or type of mapped name, nor the ability
-	      to use mapped names.  The mapped name is
-	      product-dependent and often installation-dependent.  No
-	      use of a mapped name is portable.
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="injection-target"
-		   type="javaee:injection-targetType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="role-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The role-nameType designates the name of a security role.
-
-	The name must conform to the lexical rules for a token.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="run-asType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The run-asType specifies the run-as identity to be
-	used for the execution of a component. It contains an
-	optional description, and the name of a security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="javaee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-role-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-role-refType contains the declaration of a
-	security role reference in a component's or a
-	Deployment Component's code. The declaration consists of an
-	optional description, the security role name used in the
-	code, and an optional link to a security role. If the
-	security role is not specified, the Deployer must choose an
-	appropriate security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="javaee:role-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The value of the role-name element must be the String used
-	    as the parameter to the
-	    EJBContext.isCallerInRole(String roleName) method or the
-	    HttpServletRequest.isUserInRole(String role) method.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="role-link"
-		   type="javaee:role-nameType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The role-link element is a reference to a defined
-	    security role. The role-link element must contain
-	    the name of one of the security roles defined in the
-	    security-role elements.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The security-roleType contains the definition of a security
-	  role. The definition consists of an optional description of
-	  the security role, and the security role name.
-
-	  Example:
-
-	      <security-role>
-	      <description>
-		  This role includes all employees who are authorized
-		  to access the employee service application.
-	      </description>
-	      <role-name>employee</role-name>
-	      </security-role>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="javaee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="string">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a special string datatype that is defined by Java EE as
-	a base type for defining collapsed strings. When schemas
-	require trailing/leading space elimination as well as
-	collapsing the existing whitespace, this base type may be
-	used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="true-falseType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This simple type designates a boolean with only two
-	permissible values
-
-	- true
-	- false
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdBooleanType">
-	<xsd:pattern value="(true|false)"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="url-patternType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The url-patternType contains the url pattern of the mapping.
-	It must follow the rules specified in Section 11.2 of the
-	Servlet API Specification. This pattern is assumed to be in
-	URL-decoded form and must not contain CR(#xD) or LF(#xA).
-	If it contains those characters, the container must inform
-	the developer with a descriptive error message.
-	The container must preserve all characters including whitespaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdAnyURIType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:anyURI.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:anyURI">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdBooleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:boolean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:integer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:integer">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNMTOKENType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:NMTOKEN.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:NMTOKEN">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNonNegativeIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:nonNegativeInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:nonNegativeInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdPositiveIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:positiveInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:positiveInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdQNameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:QName.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:QName">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:string.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_2.xsd
deleted file mode 100644
index e28cb1cefb..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_2.xsd
+++ /dev/null
@@ -1,747 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.2">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)javaee_web_services_1_2.xsds	1.18 02/13/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the Java EE Application
-	Server and the dependencies they have on container resources and
-	services.  The deployment descriptor must be named
-	"META-INF/webservices.xml" in the web services' jar file.
-
-	Used in: webservices.xml
-
-	All webservices deployment descriptors must indicate the
-	webservices schema by using the Java EE namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and by indicating the version of the schema by using the version
-	element as shown below:
-
-	    <webservices xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-		http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
-	      version="1.2">
-	      ...
-	    </webservices>
-
-	The instance documents may indicate the published version of the
-	schema using the xsi:schemaLocation attribute for the Java EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="webservices" type="javaee:webservicesType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the Java EE Application Server
-	and the dependencies they have on container resources and services.
-
-	Used in: webservices.xml
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="webservice-description-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The webservice-description-name identifies the collection of
-	  port-components associated with a WSDL file and JAX-RPC mapping. The
-	  name must be unique within the deployment descriptor.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:webservice-description"/>
-      <xsd:field xpath="javaee:webservice-description-name"/>
-    </xsd:key>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="handler-chainType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chain element defines the handlerchain.
-      Handlerchain can be defined such that the handlers in the
-      handlerchain operate,all ports of a service, on a specific
-      port or on a list of protocol-bindings. The choice of elements
-      service-name-pattern, port-name-pattern and protocol-bindings
-      are used to specify whether the handlers in handler-chain are
-      for a service, port or protocol binding. If none of these
-      choices are specified with the handler-chain element then the
-      handlers specified in the handler-chain will be applied on
-      everything.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:choice minOccurs="0" maxOccurs="1">
-         <xsd:element name="service-name-pattern"
-		      type="javaee:qname-pattern" />
-         <xsd:element name="port-name-pattern"
-		      type="javaee:qname-pattern" />
-         <xsd:element name="protocol-bindings"
-		      type="javaee:protocol-bindingListType"/>
-      </xsd:choice>
-
-      <xsd:element name="handler"
-                   type="javaee:port-component_handlerType"
-		   minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="handler-chainsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chains element defines the handlerchains associated
-      with this service or service endpoint.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="handler-chain"
-                   type="javaee:handler-chainType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-componentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component element associates a WSDL port with a web service
-	interface and implementation.  It defines the name of the port as a
-	component, optional description, optional display name, optional iconic
-	representations, WSDL port QName, Service Endpoint Interface, Service
-	Implementation Bean.
-
-	This element also associates a WSDL service with a JAX-WS Provider
-	implementation.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="port-component-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The port-component-name element specifies a port component's
-	      name.  This name is assigned by the module producer to name
-	      the service implementation bean in the module's deployment
-	      descriptor. The name must be unique among the port component
-	      names defined in the same module.
-
-	      Used in: port-component
-
-	      Example:
-		      <port-component-name>EmployeeService
-		      </port-component-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-service"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name space and local name part of the WSDL
-	    service QName. This is required to be specified for
-	    port components that are JAX-WS Provider implementations.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-port"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name space and local name part of the WSDL
-	    port QName. This is not required to be specified for port
-	    components that are JAX-WS Provider implementations
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="enable-mtom"
-                   type="javaee:true-falseType"
-		   minOccurs="0" maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to enable or disable SOAP MTOM/XOP mechanism for an
-            endpoint implementation.
-
-	    Not to be specified for JAX-RPC runtime
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="protocol-binding"
-                   type="javaee:protocol-bindingType"
-		   minOccurs="0" maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to specify the protocol binding used by the port-component.
-	    If this element is not specified, then the default binding is
-            used (SOAP 1.1 over HTTP)
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-endpoint-interface"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The service-endpoint-interface element contains the
-	      fully-qualified name of the port component's Service Endpoint
-	      Interface.
-
-	      Used in: port-component
-
-	      Example:
-		      <remote>com.wombat.empl.EmployeeService</remote>
-
-	      This may not be specified in case there is no Service
-	      Enpoint Interface as is the case with directly using an
-	      implementation class with the @WebService annotation.
-
-	      When the port component is a Provider implementation
-	      this is not specified.
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-impl-bean"
-		   type="javaee:service-impl-beanType"/>
-
-      <xsd:choice>
-	<xsd:element name="handler"
-		     type="javaee:port-component_handlerType"
-		     minOccurs="0" maxOccurs="unbounded">
-	  <xsd:annotation>
-	    <xsd:documentation>
-		 To be used with JAX-RPC based runtime only.
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="handler-chains"
-		     type="javaee:handler-chainsType"
-		     minOccurs="0" maxOccurs="1">
-	  <xsd:annotation>
-	    <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique within the
-	    module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed by the
-	    handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="soap-role"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that the
-	    Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="protocol-URIAliasType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type that is used for specifying tokens that
-	   start with ## which are used to alias existing standard
-	   protocol bindings and support aliases for new standard
-	   binding URIs that are introduced in future specifications.
-
-	   The following tokens alias the standard protocol binding
-	   URIs:
-
-	   ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
-	   ##SOAP11_HTTP_MTOM =
-                 "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
-           ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-           ##SOAP12_HTTP_MTOM =
-		 "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
-           ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="##.+"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="protocol-bindingListType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying a list of
-	   protocol-bindingType(s). For e.g.
-
-	    ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:list itemType="javaee:protocol-bindingType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="protocol-bindingType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying the URI for the
-	   protocol binding used by the port-component.  For
-	   portability one could use one of the following tokens that
-	   alias the standard binding types:
-
-	    ##SOAP11_HTTP
-	    ##SOAP11_HTTP_MTOM
-	    ##SOAP12_HTTP
-	    ##SOAP12_HTTP_MTOM
-	    ##XML_HTTP
-
-	   Other specifications could define tokens that start with ##
-	   to alias new standard binding URIs that are introduced.
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="qname-pattern">
-     <xsd:annotation>
-        <xsd:documentation>
-	     This is used to specify the QName pattern in the
-	     attribute service-name-pattern and port-name-pattern in
-	     the handler-chain element
-
-	     For example, the various forms acceptable here for
-	     service-name-pattern attribute in handler-chain element
-	     are :
-
-	     Exact Name: service-name-pattern="ns1:EchoService"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports with
-		 this exact service name. The namespace prefix must
-		 have been declared in a namespace declaration
-		 attribute in either the start-tag of the element
-		 where the prefix is used or in an an ancestor
-		 element (i.e. an element in whose content the
-		 prefixed markup occurs)
-
-	     Pattern : service-name-pattern="ns1:EchoService*"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports whose
-		 Service names are like EchoService1, EchoServiceFoo
-		 etc. The namespace prefix must have been declared in
-		 a namespace declaration attribute in either the
-		 start-tag of the element where the prefix is used or
-		 in an an ancestor element (i.e. an element in whose
-		 content the prefixed markup occurs)
-
-	     Wild Card : service-name-pattern="*"
-
-		In this case, handlers specified in this handler-chain
-		element will apply to ports of all service names.
-
-	    The same can be applied to port-name attribute in
-	    handler-chain element.
-
-        </xsd:documentation>
-     </xsd:annotation>
-
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/>
-     </xsd:restriction>
-
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-impl-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-impl-bean element defines the web service implementation.
-	A service implementation can be an EJB bean class or JAX-RPC web
-	component.  Existing EJB implementations are exposed as a web service
-	using an ejb-link.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="ejb-link"
-		   type="javaee:ejb-linkType"/>
-      <xsd:element name="servlet-link"
-		   type="javaee:servlet-linkType"/>
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The servlet-link element is used in the service-impl-bean element
-	  to specify that a Service Implementation Bean is defined as a
-	  JAX-RPC Service Endpoint.
-
-	  The value of the servlet-link element must be the servlet-name of
-	  a JAX-RPC Service Endpoint in the same WAR file.
-
-	  Used in: service-impl-bean
-
-	  Example:
-		  <servlet-link>StockQuoteService</servlet-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservice-descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservice-description element defines a WSDL document file
-	and the set of Port components associated with the WSDL ports
-	defined in the WSDL document.  There may be multiple
-	webservice-descriptions defined within a module.
-
-	All WSDL file ports must have a corresponding port-component element
-	defined.
-
-	Used in: webservices
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="webservice-description-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The webservice-description-name identifies the collection of
-	    port-components associated with a WSDL file and JAX-RPC
-	    mapping. The name must be unique within the deployment descriptor.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-file"
-		   type="javaee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the name of a WSDL file in the
-	    module.  The file name is a relative path within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="javaee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module.
-
-	    This is not required when JAX-WS based runtime is used.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-component"
-		   type="javaee:port-componentType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:handler"/>
-	  <xsd:field xpath="javaee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservicesType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="webservice-description"
-		   type="javaee:webservice-descriptionType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	      <![CDATA[
-
-		The port-component-name element specifies a port
-		component's name.  This name is assigned by the module
-		producer to name the service implementation bean in the
-		module's deployment descriptor. The name must be unique
-		among the port component names defined in the same module.
-
-		Used in: port-component
-
-		Example:
-			<port-component-name>EmployeeService
-			</port-component-name>
-
-		]]>
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:port-component"/>
-	  <xsd:field xpath="javaee:port-component-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="1.2"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.2.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_2.xsd
deleted file mode 100644
index 3df0dd6279..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_2.xsd
+++ /dev/null
@@ -1,578 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.2">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component-ref element declares a client dependency
-	on the container for resolving a Service Endpoint Interface
-	to a WSDL port. It optionally associates the Service Endpoint
-	Interface with a particular port-component. This is only used
-	by the container for a Service.getPort(Class) method call.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="service-endpoint-interface"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint-interface element defines a fully qualified
-	    Java class that represents the Service Endpoint Interface of a
-	    WSDL port.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="enable-mtom"
-                   type="javaee:true-falseType"
-		   minOccurs="0" maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to enable or disable SOAP MTOM/XOP mechanism on the client
-	    side for a port-component.
-
-	    Not to be specified for JAX-RPC runtime
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-link"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-link element links a port-component-ref
-	    to a specific port-component required to be made available
-	    by a service reference.
-
-	    The value of a port-component-link must be the
-	    port-component-name of a port-component in the same module
-	    or another module in the same application unit. The syntax
-	    for specification follows the syntax defined for ejb-link
-	    in the EJB 2.0 specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="service-refGroup">
-    <xsd:sequence>
-      <xsd:element name="service-ref"
-		   type="javaee:service-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:key name="service-ref_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:handler"/>
-	  <xsd:field xpath="javaee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-ref element declares a reference to a Web
-	service. It contains optional description, display name and
-	icons, a declaration of the required Service interface,
-	an optional WSDL document location, an optional set
-	of JAX-RPC mappings, an optional QName for the service element,
-	an optional set of Service Endpoint Interfaces to be resolved
-	by the container to a WSDL port, and an optional set of handlers.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="service-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-ref-name element declares logical name that the
-	    components in the module use to look up the Web service. It
-	    is recommended that all service reference names start with
-	    "service/".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-interface"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-interface element declares the fully qualified class
-	    name of the JAX-RPC Service interface the client depends on.
-	    In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	    generated Service Interface class may also be specified.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-ref-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-ref-type element declares the type of the service-ref
-	    element that is injected or returned when a JNDI lookup is done.
-	    This must be either a fully qualified name of Service class or
-	    the fully qualified name of service endpoint interface class.
-	    This is only used with JAX-WS runtime where the corresponding
-	    @WebServiceRef annotation can be used to denote both a Service
-	    or a Port.
-
-	    If this is not specified, then the type of service-ref element
-	    that is injected or returned when a JNDI lookup is done is
-	    always a Service interface/class.
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="wsdl-file"
-		   type="javaee:xsdAnyURIType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the URI location of a WSDL
-	    file. The location is relative to the root of the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="javaee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module file.
-
-	    This is not required when JAX-WS based runtime is used.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-qname"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-qname element declares the specific WSDL service
-	    element that is being refered to.  It is not specified if no
-	    wsdl-file is declared.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-ref"
-		   type="javaee:port-component-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-ref element declares a client dependency
-	    on the container for resolving a Service Endpoint Interface
-	    to a WSDL port. It optionally associates the Service Endpoint
-	    Interface with a particular port-component. This is only used
-	    by the container for a Service.getPort(Class) method call.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:choice>
-	  <xsd:element name="handler"
-		       type="javaee:service-ref_handlerType"
-		       minOccurs="0" maxOccurs="unbounded">
-	    <xsd:annotation>
-	      <xsd:documentation>
-
-		Declares the handler for a port-component. Handlers can
-		access the init-param name/value pairs using the
-		HandlerInfo interface. If port-name is not specified, the
-		handler is assumed to be associated with all ports of the
-		service.
-
-		To be used with JAX-RPC based runtime only.
-
-	      </xsd:documentation>
-	    </xsd:annotation>
-	  </xsd:element>
-	  <xsd:element name="handler-chains"
-		       type="javaee:service-ref_handler-chainsType"
-		       minOccurs="0" maxOccurs="1">
-	    <xsd:annotation>
-	      <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
-	      </xsd:documentation>
-	    </xsd:annotation>
-	  </xsd:element>
-      </xsd:choice>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handler-chainType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chain element defines the handlerchain.
-      Handlerchain can be defined such that the handlers in the
-      handlerchain operate,all ports of a service, on a specific
-      port or on a list of protocol-bindings. The choice of elements
-      service-name-pattern, port-name-pattern and protocol-bindings
-      are used to specify whether the handlers in handler-chain are
-      for a service, port or protocol binding. If none of these
-      choices are specified with the handler-chain element then the
-      handlers specified in the handler-chain will be applied on
-      everything.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:choice minOccurs="0" maxOccurs="1">
-         <xsd:element name="service-name-pattern"
-		      type="javaee:service-ref_qname-pattern" />
-         <xsd:element name="port-name-pattern"
-	              type="javaee:service-ref_qname-pattern" />
-         <xsd:element name="protocol-bindings"
-	              type="javaee:service-ref_protocol-bindingListType"/>
-      </xsd:choice>
-
-      <xsd:element name="handler"
-                   type="javaee:service-ref_handlerType"
-		   minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handler-chainsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chains element defines the handlerchains associated with this
-      service or service endpoint.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="handler-chain"
-                   type="javaee:service-ref_handler-chainType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface. If
-	port-name is not specified, the handler is assumed to be associated
-	with all ports of the service.
-
-	Used in: service-ref
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique
-	    within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler
-	    implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed
-	    by the handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="soap-role"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that
-	    the Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-name"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-name element defines the WSDL port-name that a
-	    handler should be associated with.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_protocol-URIAliasType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type that is used for specifying tokens that
-	   start with ## which are used to alias existing standard
-	   protocol bindings and support aliases for new standard
-	   binding URIs that are introduced in future specifications.
-
-	   The following tokens alias the standard protocol binding
-	   URIs:
-
-	   ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
-	   ##SOAP11_HTTP_MTOM =
-                 "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
-           ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-           ##SOAP12_HTTP_MTOM =
-                 "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
-           ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="##.+"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_protocol-bindingListType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying a list of
-	   protocol-bindingType(s). For e.g.
-
-	    ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:list itemType="javaee:service-ref_protocol-bindingType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_protocol-bindingType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying the URI for the
-	   protocol binding used by the port-component.  For
-	   portability one could use one of the following tokens that
-	   alias the standard binding types:
-
-	    ##SOAP11_HTTP
-	    ##SOAP11_HTTP_MTOM
-            ##SOAP12_HTTP
-            ##SOAP12_HTTP_MTOM
-            ##XML_HTTP
-
-	   Other specifications could define tokens that start with ##
-	   to alias new standard binding URIs that are introduced.
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:union memberTypes="xsd:anyURI javaee:service-ref_protocol-URIAliasType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_qname-pattern">
-     <xsd:annotation>
-        <xsd:documentation>
-	     This is used to specify the QName pattern in the
-	     attribute service-name-pattern and port-name-pattern in
-	     the handler-chain element
-
-	     For example, the various forms acceptable here for
-	     service-name-pattern attribute in handler-chain element
-	     are :
-
-	     Exact Name: service-name-pattern="ns1:EchoService"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports with
-		 this exact service name. The namespace prefix must
-		 have been declared in a namespace declaration
-		 attribute in either the start-tag of the element
-		 where the prefix is used or in an an ancestor
-		 element (i.e. an element in whose content the
-		 prefixed markup occurs)
-
-	     Pattern : service-name-pattern="ns1:EchoService*"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports whose
-		 Service names are like EchoService1, EchoServiceFoo
-		 etc. The namespace prefix must have been declared in
-		 a namespace declaration attribute in either the
-		 start-tag of the element where the prefix is used or
-		 in an an ancestor element (i.e. an element in whose
-		 content the prefixed markup occurs)
-
-	     Wild Card : service-name-pattern="*"
-
-		In this case, handlers specified in this handler-chain
-		element will apply to ports of all service names.
-
-	    The same can be applied to port-name attribute in
-	    handler-chain element.
-
-        </xsd:documentation>
-     </xsd:annotation>
-
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/>
-     </xsd:restriction>
-
-  </xsd:simpleType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_0.xsd
deleted file mode 100644
index 970a76d7df..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_0.xsd
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="2.0">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)jsp_2_0.xsds	1.17 03/18/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      This is the XML Schema for the JSP 2.0 deployment descriptor
-      types.  The JSP 2.0 schema contains all the special
-      structures and datatypes that are necessary to use JSP files
-      from a web application.
-
-      The contents of this schema is used by the web-app_2_4.xsd
-      file to define JSP specific content.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-configType is used to provide global configuration
-	information for the JSP files in a web application. It has
-	two subelements, taglib and jsp-property-group.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib"
-		   type="j2ee:taglibType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="jsp-property-group"
-		   type="j2ee:jsp-property-groupType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-fileType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-file element contains the full path to a JSP file
-	within the web application beginning with a `/'.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:pathType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-property-groupType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-property-groupType is used to group a number of
-	files so they can be given global property information.
-	All files so described are deemed to be JSP files.  The
-	following additional properties can be described:
-
-	    - Control whether EL is ignored
-	    - Control whether scripting elements are invalid
-	    - Indicate pageEncoding information.
-	    - Indicate that a resource is a JSP document (XML)
-	    - Prelude and Coda automatic includes.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="url-pattern"
-		   type="j2ee:url-patternType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="el-ignored"
-		   type="j2ee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily set the isELIgnored
-	    property of a group of JSP pages.  By default, the
-	    EL evaluation is enabled for Web Applications using
-	    a Servlet 2.4 or greater web.xml, and disabled
-	    otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="page-encoding"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The valid values of page-encoding are those of the
-	    pageEncoding page directive.  It is a
-	    translation-time error to name different encodings
-	    in the pageEncoding attribute of the page directive
-	    of a JSP page and in a JSP configuration element
-	    matching the page.  It is also a translation-time
-	    error to name different encodings in the prolog
-	    or text declaration of a document in XML syntax and
-	    in a JSP configuration element matching the document.
-	    It is legal to name the same encoding through
-	    mulitple mechanisms.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="scripting-invalid"
-		   type="j2ee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily disable scripting in a
-	    group of JSP pages.  By default, scripting is
-	    enabled.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="is-xml"
-		   type="j2ee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    If true, denotes that the group of resources
-	    that match the URL pattern are JSP documents,
-	    and thus must be interpreted as XML documents.
-	    If false, the resources are assumed to not
-	    be JSP documents, unless there is another
-	    property group that indicates otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-prelude"
-		   type="j2ee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-prelude element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the beginning of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-coda"
-		   type="j2ee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-coda element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the end of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="taglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglibType defines the syntax for declaring in
-	the deployment descriptor that a tag library is
-	available to the application.  This can be done
-	to override implicit map entries from TLD files and
-	from the container.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib-uri"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    A taglib-uri element describes a URI identifying a
-	    tag library used in the web application.  The body
-	    of the taglib-uri element may be either an
-	    absolute URI specification, or a relative URI.
-	    There should be no entries in web.xml with the
-	    same taglib-uri value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="taglib-location"
-		   type="j2ee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    the taglib-location element contains the location
-	    (as a resource relative to the root of the web
-	    application) where to find the Tag Library
-	    Description file for the tag library.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_1.xsd
deleted file mode 100644
index ab633886d9..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_1.xsd
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="2.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)jsp_2_1.xsds	1.5 08/11/05
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      This is the XML Schema for the JSP 2.1 deployment descriptor
-      types.  The JSP 2.1 schema contains all the special
-      structures and datatypes that are necessary to use JSP files
-      from a web application.
-
-      The contents of this schema is used by the web-app_2_5.xsd
-      file to define JSP specific content.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-configType is used to provide global configuration
-	information for the JSP files in a web application. It has
-	two subelements, taglib and jsp-property-group.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib"
-		   type="javaee:taglibType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="jsp-property-group"
-		   type="javaee:jsp-property-groupType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-fileType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-file element contains the full path to a JSP file
-	within the web application beginning with a `/'.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:pathType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-property-groupType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-property-groupType is used to group a number of
-	files so they can be given global property information.
-	All files so described are deemed to be JSP files.  The
-	following additional properties can be described:
-
-	    - Control whether EL is ignored.
-	    - Control whether scripting elements are invalid.
-	    - Indicate pageEncoding information.
-	    - Indicate that a resource is a JSP document (XML).
-	    - Prelude and Coda automatic includes.
-            - Control whether the character sequence #{ is allowed
-              when used as a String literal.
-            - Control whether template text containing only
-              whitespaces must be removed from the response output.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="url-pattern"
-		   type="javaee:url-patternType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="el-ignored"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily set the isELIgnored
-	    property of a group of JSP pages.  By default, the
-	    EL evaluation is enabled for Web Applications using
-	    a Servlet 2.4 or greater web.xml, and disabled
-	    otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="page-encoding"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The valid values of page-encoding are those of the
-	    pageEncoding page directive.  It is a
-	    translation-time error to name different encodings
-	    in the pageEncoding attribute of the page directive
-	    of a JSP page and in a JSP configuration element
-	    matching the page.  It is also a translation-time
-	    error to name different encodings in the prolog
-	    or text declaration of a document in XML syntax and
-	    in a JSP configuration element matching the document.
-	    It is legal to name the same encoding through
-	    mulitple mechanisms.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="scripting-invalid"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily disable scripting in a
-	    group of JSP pages.  By default, scripting is
-	    enabled.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="is-xml"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    If true, denotes that the group of resources
-	    that match the URL pattern are JSP documents,
-	    and thus must be interpreted as XML documents.
-	    If false, the resources are assumed to not
-	    be JSP documents, unless there is another
-	    property group that indicates otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-prelude"
-		   type="javaee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-prelude element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the beginning of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-coda"
-		   type="javaee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-coda element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the end of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="deferred-syntax-allowed-as-literal"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-             The character sequence #{ is reserved for EL expressions.
-             Consequently, a translation error occurs if the #{
-             character sequence is used as a String literal, unless
-             this element is enabled (true). Disabled (false) by
-             default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="trim-directive-whitespaces"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-             Indicates that template text containing only whitespaces
-             must be removed from the response output. It has no
-             effect on JSP documents (XML syntax). Disabled (false)
-             by default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="taglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglibType defines the syntax for declaring in
-	the deployment descriptor that a tag library is
-	available to the application.  This can be done
-	to override implicit map entries from TLD files and
-	from the container.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib-uri"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    A taglib-uri element describes a URI identifying a
-	    tag library used in the web application.  The body
-	    of the taglib-uri element may be either an
-	    absolute URI specification, or a relative URI.
-	    There should be no entries in web.xml with the
-	    same taglib-uri value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="taglib-location"
-		   type="javaee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    the taglib-location element contains the location
-	    (as a resource relative to the root of the web
-	    application) where to find the Tag Library
-	    Description file for the tag library.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/orm_1_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/orm_1_0.xsd
deleted file mode 100644
index bfd9c7540d..0000000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/orm_1_0.xsd
+++ /dev/null
@@ -1,1562 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Java Persistence API object-relational mapping file schema -->
-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" 
-  xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  elementFormDefault="qualified" 
-  attributeFormDefault="unqualified" 
-  version="1.0">
-
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)orm_1_0.xsd 1.0  Feb 14 2006
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-      Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
-
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-
-      Contributor(s):
-
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-
-      The Eclipse Foundation elects to include this software in this
-      distribution under the CDDL license.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-     <xsd:documentation><![CDATA[
-
-       This is the XML Schema for the persistence object-relational 
-       mapping file.
-       The file may be named "META-INF/orm.xml" in the persistence 
-       archive or it may be named some other name which would be 
-       used to locate the file as resource on the classpath.
-
-     ]]></xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:complexType name="emptyType"/>
-
-  <xsd:simpleType name="versionType">
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[0-9]+(\.[0-9]+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:element name="entity-mappings">
-    <xsd:complexType>
-      <xsd:annotation>
-        <xsd:documentation>
-
-        The entity-mappings element is the root element of an mapping
-        file. It contains the following four types of elements:
-
-        1. The persistence-unit-metadata element contains metadata
-        for the entire persistence unit. It is undefined if this element
-        occurs in multiple mapping files within the same persistence unit.
-        
-        2. The package, schema, catalog and access elements apply to all of
-        the entity, mapped-superclass and embeddable elements defined in
-        the same file in which they occur.
-
-        3. The sequence-generator, table-generator, named-query,
-        named-native-query and sql-result-set-mapping elements are global
-        to the persistence unit. It is undefined to have more than one
-        sequence-generator or table-generator of the same name in the same
-        or different mapping files in a persistence unit. It is also 
-        undefined to have more than one named-query or named-native-query
-        of the same name in the same or different mapping files in a 
-        persistence unit.
-
-        4. The entity, mapped-superclass and embeddable elements each define
-        the mapping information for a managed persistent class. The mapping
-        information contained in these elements may be complete or it may
-        be partial.
-
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:sequence>
-        <xsd:element name="description" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="persistence-unit-metadata" 
-                     type="orm:persistence-unit-metadata"
-                     minOccurs="0"/>
-        <xsd:element name="package" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="schema" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="catalog" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="access" type="orm:access-type"
-                     minOccurs="0"/>
-        <xsd:element name="sequence-generator" type="orm:sequence-generator"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="table-generator" type="orm:table-generator" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="named-query" type="orm:named-query" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="named-native-query" type="orm:named-native-query"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="sql-result-set-mapping" 
-                     type="orm:sql-result-set-mapping" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="mapped-superclass" type="orm:mapped-superclass" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="entity" type="orm:entity" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="embeddable" type="orm:embeddable" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="version" type="orm:versionType" 
-                     fixed="1.0" use="required"/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-metadata">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Metadata that applies to the persistence unit and not just to 
-        the mapping file in which it is contained. 
-
-        If the xml-mapping-metadata-complete element is specified then 
-        the complete set of mapping metadata for the persistence unit 
-        is contained in the XML mapping files for the persistence unit.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="persistence-unit-defaults" 
-                   type="orm:persistence-unit-defaults"
-                   minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-defaults">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        These defaults are applied to the persistence unit as a whole 
-        unless they are overridden by local annotation or XML 
-        element settings. 
-        
-        schema - Used as the schema for all tables or secondary tables
-            that apply to the persistence unit
-        catalog - Used as the catalog for all tables or secondary tables
-            that apply to the persistence unit
-        access - Used as the access type for all managed classes in
-            the persistence unit
-        cascade-persist - Adds cascade-persist to the set of cascade options
-            in entity relationships of the persistence unit
-        entity-listeners - List of default entity listeners to be invoked 
-            on each entity in the persistence unit. 
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="schema" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="catalog" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="access" type="orm:access-type"
-                     minOccurs="0"/>
-        <xsd:element name="cascade-persist" type="orm:emptyType" 
-                     minOccurs="0"/>
-        <xsd:element name="entity-listeners" type="orm:entity-listeners"
-                     minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for an entity. Is allowed to be
-        sparsely populated and used in conjunction with the annotations.
-        Alternatively, the metadata-complete attribute can be used to 
-        indicate that no annotations on the entity class (and its fields
-        or properties) are to be processed. If this is the case then 
-        the defaulting rules for the entity and its subelements will 
-        be recursively applied.
-
-        @Target(TYPE) @Retention(RUNTIME)
-          public @interface Entity {
-          String name() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="table" type="orm:table" 
-                   minOccurs="0"/>
-      <xsd:element name="secondary-table" type="orm:secondary-table" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="primary-key-join-column" 
-                   type="orm:primary-key-join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/>
-      <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/>
-      <xsd:element name="discriminator-value" type="orm:discriminator-value" 
-                   minOccurs="0"/>
-      <xsd:element name="discriminator-column" 
-                   type="orm:discriminator-column" 
-                   minOccurs="0"/>
-      <xsd:element name="sequence-generator" type="orm:sequence-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="table-generator" type="orm:table-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="named-query" type="orm:named-query" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="named-native-query" type="orm:named-native-query" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="sql-result-set-mapping" 
-                   type="orm:sql-result-set-mapping" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="exclude-default-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="entity-listeners" type="orm:entity-listeners" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="association-override" 
-                   type="orm:association-override"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-    <xsd:attribute name="access" type="orm:access-type"/>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="attributes">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element contains the entity field or property mappings.
-        It may be sparsely populated to include only a subset of the
-        fields or properties. If metadata-complete for the entity is true
-        then the remainder of the attributes will be defaulted according
-        to the default rules.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="id" type="orm:id" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="embedded-id" type="orm:embedded-id" 
-                     minOccurs="0"/>
-      </xsd:choice>
-      <xsd:element name="basic" type="orm:basic"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="version" type="orm:version"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="many-to-one" type="orm:many-to-one"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="one-to-many" type="orm:one-to-many"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="one-to-one" type="orm:one-to-one"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="many-to-many" type="orm:many-to-many" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="embedded" type="orm:embedded"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="transient" type="orm:transient"
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="access-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element determines how the persistence provider accesses the
-        state of an entity or embedded object.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="PROPERTY"/>
-      <xsd:enumeration value="FIELD"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-listeners">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface EntityListeners {
-          Class[] value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="entity-listener" type="orm:entity-listener" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-listener">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines an entity listener to be invoked at lifecycle events
-        for the entities that list this listener.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-persist">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PrePersist {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-persist">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostPersist {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-remove">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PreRemove {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-remove">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostRemove {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-update">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PreUpdate {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-update">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostUpdate {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-load">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostLoad {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="query-hint">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME) 
-        public @interface QueryHint {
-          String name();
-          String value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="value" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="named-query">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface NamedQuery {
-          String name();
-          String query();
-          QueryHint[] hints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="query" type="xsd:string"/>
-      <xsd:element name="hint" type="orm:query-hint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="named-native-query">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface NamedNativeQuery {
-          String name();
-          String query();
-          QueryHint[] hints() default {};
-          Class resultClass() default void.class;
-          String resultSetMapping() default ""; //named SqlResultSetMapping
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="query" type="xsd:string"/>
-      <xsd:element name="hint" type="orm:query-hint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="result-class" type="xsd:string"/>
-    <xsd:attribute name="result-set-mapping" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="sql-result-set-mapping">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface SqlResultSetMapping {
-          String name();
-          EntityResult[] entities() default {};
-          ColumnResult[] columns() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="entity-result" type="orm:entity-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="column-result" type="orm:column-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface EntityResult {
-          Class entityClass();
-          FieldResult[] fields() default {};
-          String discriminatorColumn() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="field-result" type="orm:field-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="entity-class" type="xsd:string" use="required"/>
-    <xsd:attribute name="discriminator-column" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="field-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface FieldResult {
-          String name();
-          String column();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="column" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="column-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface ColumnResult {
-          String name();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Table {
-          String name() default "";
-          String catalog() default "";
-          String schema() default "";
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="secondary-table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface SecondaryTable {
-          String name();
-          String catalog() default "";
-          String schema() default "";
-          PrimaryKeyJoinColumn[] pkJoinColumns() default {};
-          UniqueConstraint[] uniqueConstraints() default {};
-         }
-
-       </xsd:documentation>
-     </xsd:annotation>
-     <xsd:sequence>
-       <xsd:element name="primary-key-join-column" 
-                    type="orm:primary-key-join-column" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-       <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="unique-constraint">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface UniqueConstraint {
-          String[] columnNames();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column-name" type="xsd:string" 
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Column {
-          String name() default "";
-          boolean unique() default false;
-          boolean nullable() default true;
-          boolean insertable() default true;
-          boolean updatable() default true;
-          String columnDefinition() default "";
-          String table() default "";
-          int length() default 255;
-          int precision() default 0; // decimal precision
-          int scale() default 0; // decimal scale
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="unique" type="xsd:boolean"/>
-    <xsd:attribute name="nullable" type="xsd:boolean"/>
-    <xsd:attribute name="insertable" type="xsd:boolean"/>
-    <xsd:attribute name="updatable" type="xsd:boolean"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-    <xsd:attribute name="length" type="xsd:int"/>
-    <xsd:attribute name="precision" type="xsd:int"/>
-    <xsd:attribute name="scale" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="join-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface JoinColumn {
-          String name() default "";
-          String referencedColumnName() default "";
-          boolean unique() default false;
-          boolean nullable() default true;
-          boolean insertable() default true;
-          boolean updatable() default true;
-          String columnDefinition() default "";
-          String table() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="referenced-column-name" type="xsd:string"/>
-    <xsd:attribute name="unique" type="xsd:boolean"/>
-    <xsd:attribute name="nullable" type="xsd:boolean"/>
-    <xsd:attribute name="insertable" type="xsd:boolean"/>
-    <xsd:attribute name="updatable" type="xsd:boolean"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="generation-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="TABLE"/>
-      <xsd:enumeration value="SEQUENCE"/>
-      <xsd:enumeration value="IDENTITY"/>
-      <xsd:enumeration value="AUTO"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="attribute-override">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface AttributeOverride {
-          String name();
-          Column column();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="association-override">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface AssociationOverride {
-          String name();
-          JoinColumn[] joinColumns();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="join-column" type="orm:join-column"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="id-class">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface IdClass {
-          Class value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="id">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Id {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" 
-                   minOccurs="0"/>
-      <xsd:element name="generated-value" type="orm:generated-value"
-                   minOccurs="0"/>
-      <xsd:element name="temporal" type="orm:temporal" 
-                   minOccurs="0"/>
-      <xsd:element name="table-generator" type="orm:table-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="sequence-generator" type="orm:sequence-generator"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embedded-id">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface EmbeddedId {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="transient">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Transient {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="version">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Version {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" minOccurs="0"/>
-      <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="basic">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Basic {
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" minOccurs="0"/>
-      <xsd:choice>
-        <xsd:element name="lob" type="orm:lob" minOccurs="0"/>
-        <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/>
-        <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="fetch-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum FetchType { LAZY, EAGER };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="LAZY"/>
-      <xsd:enumeration value="EAGER"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="lob">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Lob {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="temporal">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Temporal {
-          TemporalType value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="orm:temporal-type"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="temporal-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum TemporalType {
-          DATE, // java.sql.Date
-          TIME, // java.sql.Time
-          TIMESTAMP // java.sql.Timestamp
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-      <xsd:restriction base="xsd:token">
-        <xsd:enumeration value="DATE"/>
-        <xsd:enumeration value="TIME"/>
-        <xsd:enumeration value="TIMESTAMP"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="enumerated">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Enumerated {
-          EnumType value() default ORDINAL;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="orm:enum-type"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="enum-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum EnumType {
-          ORDINAL,
-          STRING
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="ORDINAL"/>
-      <xsd:enumeration value="STRING"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="many-to-one">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface ManyToOne {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>       
-        <xsd:element name="join-column" type="orm:join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-table" type="orm:join-table" 
-                     minOccurs="0"/>
-      </xsd:choice>       
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="cascade-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="cascade-all" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-persist" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-merge" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-remove" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-refresh" type="orm:emptyType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="one-to-one">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OneToOne {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="primary-key-join-column" 
-                     type="orm:primary-key-join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-column" type="orm:join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-table" type="orm:join-table" 
-                     minOccurs="0"/>
-      </xsd:choice>
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="one-to-many">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OneToMany {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default LAZY;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="order-by" type="orm:order-by" 
-                   minOccurs="0"/>
-      <xsd:element name="map-key" type="orm:map-key" 
-                   minOccurs="0"/>
-      <xsd:choice>       
-        <xsd:element name="join-table" type="orm:join-table" 
-                     minOccurs="0"/>
-        <xsd:element name="join-column" type="orm:join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:choice>       
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="join-table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface JoinTable {
-          String name() default "";
-          String catalog() default "";
-          String schema() default "";
-          JoinColumn[] joinColumns() default {};
-          JoinColumn[] inverseJoinColumns() default {};
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="join-column" type="orm:join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="inverse-join-column" type="orm:join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="many-to-many">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface ManyToMany {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default LAZY;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="order-by" type="orm:order-by" 
-                   minOccurs="0"/>
-      <xsd:element name="map-key" type="orm:map-key" 
-                   minOccurs="0"/>
-      <xsd:element name="join-table" type="orm:join-table" 
-                   minOccurs="0"/>
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="generated-value">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface GeneratedValue {
-          GenerationType strategy() default AUTO;
-          String generator() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="strategy" type="orm:generation-type"/>
-    <xsd:attribute name="generator" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="map-key">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface MapKey {
-          String name() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="order-by">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OrderBy {
-          String value() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="inheritance">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Inheritance {
-          InheritanceType strategy() default SINGLE_TABLE;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="strategy" type="orm:inheritance-type"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="inheritance-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum InheritanceType
-          { SINGLE_TABLE, JOINED, TABLE_PER_CLASS};
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="SINGLE_TABLE"/>
-      <xsd:enumeration value="JOINED"/>
-      <xsd:enumeration value="TABLE_PER_CLASS"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="discriminator-value">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface DiscriminatorValue {
-          String value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="discriminator-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum DiscriminatorType { STRING, CHAR, INTEGER };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="STRING"/>
-      <xsd:enumeration value="CHAR"/>
-      <xsd:enumeration value="INTEGER"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="primary-key-join-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface PrimaryKeyJoinColumn {
-          String name() default "";
-          String referencedColumnName() default "";
-          String columnDefinition() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="referenced-column-name" type="xsd:string"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="discriminator-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface DiscriminatorColumn {
-          String name() default "DTYPE";
-          DiscriminatorType discriminatorType() default STRING;
-          String columnDefinition() default "";
-          int length() default 31;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="length" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embeddable">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for embeddable objects. Is 
-        allowed to be sparsely populated and used in conjunction with 
-        the annotations. Alternatively, the metadata-complete attribute 
-        can be used to indicate that no annotations are to be processed 
-        in the class. If this is the case then the defaulting rules will 
-        be recursively applied.
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Embeddable {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="attributes" type="orm:embeddable-attributes" 
-                   minOccurs="0"/>
-    </xsd:sequence>