1 files changed, 0 insertions, 38 deletions
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample75.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample75.wsdl
deleted file mode 100644
index 5b312943e..000000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample75.wsdl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="sample" targetNamespace="http://www.example.org/sample75" xmlns:tns="http://www.example.org/sample75" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/sample75">
-<xsd:element name="NewOperationResponse" type="xsd:string"/><xsd:element name="NewOperationRequest" type="xsd:string"/></xsd:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.sample.org/sample75"><xsd:import namespace="http://www.sample.org/10" schemaLocation="sample10.xsd"/>
-</xsd:schema>
-</wsdl:types>
-<wsdl:message name="NewOperationResponse">
-<wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-</wsdl:message>
-<wsdl:message name="NewOperationRequest">
-<wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-</wsdl:message>
-<wsdl:portType name="sample">
-<wsdl:operation name="NewOperation">
-<wsdl:input message="tns:NewOperationRequest"/>
-<wsdl:output message="tns:NewOperationResponse"/>
-</wsdl:operation>
-</wsdl:portType>
-<wsdl:binding name="sampleSOAP" type="tns:sample">
-<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-<wsdl:operation name="NewOperation">
-<soap:operation soapAction="http://www.example.org/sample/NewOperation"/>
-<wsdl:input>
-<soap:body use="literal" parts=" NewOperationRequest"/>
-</wsdl:input>
-<wsdl:output>
-<soap:body use="literal" parts=" NewOperationResponse"/>
-</wsdl:output>
-</wsdl:operation>
-</wsdl:binding>
-<wsdl:service name="sample">
-<wsdl:port name="sampleSOAP" binding="tns:sampleSOAP">
-<soap:address location="http://www.example.org/"/>
-</wsdl:port>
-</wsdl:service>
-</wsdl:definitions>
-\ No newline at end of file
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/license.html b/features/org.eclipse.wst.web_tests.feature/license.html
deleted file mode 100644
index 56445985d..000000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_tests.feature/.cvsignore b/features/org.eclipse.wst.xml_tests.feature/.cvsignore
deleted file mode 100644
index cac99d0ea..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.xml_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.xml_tests.feature/.project b/features/org.eclipse.wst.xml_tests.feature/.project
deleted file mode 100644
index 3ff3287f0..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_tests.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_tests.feature/build.properties b/features/org.eclipse.wst.xml_tests.feature/build.properties
deleted file mode 100644
index 27affc577..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html b/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.properties b/features/org.eclipse.wst.xml_tests.feature/feature.properties
deleted file mode 100644
index bce1c9126..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST XML tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index 23fad4f9f..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_tests.feature"
-      label="%featureName"
-      version="3.0.2.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.wst.xml_ui.feature" version="3.0.1"/>
-      <import feature="org.eclipse.test" version="3.3.0"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.dtd.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.validation.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.tests.encoding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.validation.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.catalog.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_tests.feature/license.html b/features/org.eclipse.wst.xml_tests.feature/license.html
deleted file mode 100644
index 303e66574..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.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 d7925cefc..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.201.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.0,4.0.0)",
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Eclipse-LazyStart: true
-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 0c919a95d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,350 +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 {
-		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 88e271a93..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 4bba98d39..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,54 +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.201.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.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 b18d4979b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.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);
-	}
-}
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 29405ed8c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/ShowTranslationHandler.java
+++ /dev/null
@@ -1,123 +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.expressions.EvaluationContext;
-import org.eclipse.core.resources.IMarker;
-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.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.ide.IDE;
-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(ExecutionEvent event) throws ExecutionException {
-		// IDE.openEditor(event.getApplicationContext(), createEditorInput(),
-		// JavaUI.ID_CU_EDITOR, true);
-		EvaluationContext evaluationContext = (EvaluationContext) event.getApplicationContext();
-		if (evaluationContext != null) {
-			Object selection = evaluationContext.getDefaultVariable();
-			if (selection instanceof List) {
-				List list = (List) selection;
-				if (!list.isEmpty()) {
-					if (list.get(0) instanceof IDOMNode) {
-						IDOMModel model = ((IDOMNode) list.get(0)).getModel();
-						INodeAdapter adapter = model.getDocument().getAdapterFor(IJSPTranslation.class);
-						if (adapter != null) {
-							// create an IEditorInput for the Java editor
-							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);
-									JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-									JSPTranslationExtension translation = translationAdapter.getJSPTranslation();
-									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 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 15c4963a9..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ /dev/null
@@ -1,1851 +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();
-
-		boolean result = (expectedString.equals(resultString));
-		assertTrue("part 1: text update", result);
-		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();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 2: text update", result);
-		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();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 3: text update", result);
-		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();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 4: text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		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: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();
-
-		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: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();
-
-		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: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();
-
-		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: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();
-
-		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: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();
-
-		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: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();
-
-		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: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();
-
-		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: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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//  ?	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		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();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		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 760ff87ef..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 = 8;
-		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_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, IHTMLPartitions.HTML_DEFAULT});
-	}
-
-	public void testJSP2() throws IOException, BadLocationException {
-		int expectedPartitions = 11;
-		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_CONTENT_DELIMITER, IJSPPartitions.JSP_CONTENT_JAVA, IJSPPartitions.JSP_CONTENT_DELIMITER, 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>
-