1 files changed, 0 insertions, 23 deletions
diff --git a/bundles/org.eclipse.wst.html.core/build.properties b/bundles/org.eclipse.wst.html.core/build.properties
deleted file mode 100644
index 7ea2b7efc3..0000000000
--- a/bundles/org.eclipse.wst.html.core/build.properties
+++ /dev/null
@@ -1,23 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               .options,\
-               data/,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-src.includes = component.xml,\
-               build.properties
-source.. = src/
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/.cvsignore b/jsf/features/org.eclipse.jst.jsf.tests.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/.project b/jsf/features/org.eclipse.jst.jsf.tests.feature/.project
deleted file mode 100644
index 589d846..0000000
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsf.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/jsf/features/org.eclipse.jst.jsf.tests.feature/.settings/org.eclipse.core.resources.prefs b/jsf/features/org.eclipse.jst.jsf.tests.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e6a2792..0000000
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:04:27 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/build.properties b/jsf/features/org.eclipse.jst.jsf.tests.feature/build.properties
deleted file mode 100644
index 1816059..0000000
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
-src.includes = build.properties
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.jsf.tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/epl-v10.html b/jsf/features/org.eclipse.jst.jsf.tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/jsf/features/org.eclipse.jst.jsf.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/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.properties b/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.properties
deleted file mode 100644
index d668685..0000000
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.properties
+++ /dev/null
@@ -1,63 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Gerry Kessler - initial API and implementation
-###############################################################################
-feature.name=JSF Tooling Tests Feature
-feature.provider=Eclipse.org
-feature.description=JSF Tooling for WTP Automated Tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-feature.copyright=\
-Copyright (c) 2006 Oracle Corporation.\
-All rights reserved. This program and the accompanying materials\
-are made available under the terms of the Eclipse Public License v1.0\
-which accompanies this distribution, and is available at\
-http://www.eclipse.org/legal/epl-v10.html\
-\n\
-Contributors:\n\
-    Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-feature.license=\
-Eclipse Foundation Software User Agreement\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-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.\n\
-\n\
-Applicable Licenses\n\
-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 http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-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").\n\
-\n\
-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".\n\
-\n\
-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.\n\
-\n\
-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:\n\
-\n\
-The top-level (root) directory\n\
-Plug-in and Fragment directories\n\
-Subdirectories of the directory named "src" of certain Plug-ins\n\
-Feature directories \n\
-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.\n\
-\n\
-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):\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\
-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.\n\
-\n\
-Cryptography\n\
-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.\n
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml b/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml
deleted file mode 100644
index 331ce80..0000000
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.jsf.tests.feature"
-      label="%feature.name"
-      version="2.1.3.qualifier"
-      provider-name="%feature.provider">
-
-   <description>
-      %feature.description
-   </description>
-
-   <copyright>
-      %feature.copyright
-   </copyright>
-
-   <license url="license.html">
-      %feature.license
-   </license>
-
-   <plugin
-         id="org.eclipse.jst.jsf.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.metadata.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.contentassist.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.metadataprocessingtests2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.designtime.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.context.symbol.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.test.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.facesconfig.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.validation.el.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.facesconfig.ui.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.jst.pagedesigner.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.common.runtime.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/license.html b/jsf/features/org.eclipse.jst.jsf.tests.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/jsf/features/org.eclipse.jst.jsf.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/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.classpath b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.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.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.project b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.project
deleted file mode 100644
index 970c00a..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsf.common.runtime.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/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.settings/org.eclipse.jdt.core.prefs b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 335f5ca..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Nov 19 16:52:39 PST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3b884bb..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Runtime Test Plugin
-Bundle-SymbolicName: org.eclipse.jst.jsf.common.runtime.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.common.runtime.tests.RuntimeTestPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsf.common.runtime;bundle-version="[1.0.0,2.0.0)",
- org.junit
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.jsf.common.runtime.tests.model
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/build.properties b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/build.properties
deleted file mode 100644
index 3985222..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/AllRuntimeTests.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/AllRuntimeTests.java
deleted file mode 100644
index 5892995..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/AllRuntimeTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsf.common.runtime.tests.model.TestViewObject;
-import org.eclipse.jst.jsf.common.runtime.tests.model.bean.TestDataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.behavioural.TestActionSource2Info;
-import org.eclipse.jst.jsf.common.runtime.tests.model.behavioural.TestValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.component.TestComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.component.TestComponentTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.component.TestUICommandInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.component.TestUIDataInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.component.TestUIFormInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.component.TestUIInputInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.component.TestUIOutputInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.decorator.TestComponentDecorator;
-
-public class AllRuntimeTests {
-    /**
-     * @return the test suite
-     */
-    public static Test suite() 
-    {
-        TestSuite suite = new TestSuite("Test for org.eclipse.jst.jsf.common.runtime");
-        //$JUnit-BEGIN$
-        
-        suite.addTestSuite(TestValueHolderInfo.class);
-        suite.addTestSuite(TestComponentDecorator.class);
-        suite.addTestSuite(TestDataModelInfo.class);
-        suite.addTestSuite(TestComponentTypeInfo.class);
-        suite.addTestSuite(TestActionSource2Info.class);
-        
-        // test the main objects
-        suite.addTestSuite(TestViewObject.class);
-        suite.addTestSuite(TestComponentInfo.class);
-        suite.addTestSuite(TestUIOutputInfo.class);
-        suite.addTestSuite(TestUIInputInfo.class);
-        suite.addTestSuite(TestUICommandInfo.class);
-        suite.addTestSuite(TestUIFormInfo.class);
-        suite.addTestSuite(TestUIDataInfo.class);
-        
-        //$JUnit-END$
-        return suite;
-    }
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/RuntimeTestPlugin.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/RuntimeTestPlugin.java
deleted file mode 100644
index 6172549..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/RuntimeTestPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RuntimeTestPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jst.jsf.common.runtime.tests";
-
-	// The shared instance
-	private static RuntimeTestPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public RuntimeTestPlugin() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static RuntimeTestPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/debug/TestRenderNode.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/debug/TestRenderNode.java
deleted file mode 100644
index 5f5b2e5..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/debug/TestRenderNode.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.debug;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsf.common.runtime.internal.debug.RenderAttribute;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.RenderNode;
-
-public class TestRenderNode extends TestCase {
-
-    private RenderNode      _renderNode;
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        _renderNode = new RenderNode("org.eclipse.jsf.jst.CompType", "th");
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testGetComponentId() 
-    {
-        assertEquals("org.eclipse.jsf.jst.CompType", _renderNode.getComponentId());
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testGetChildren() {
-        RenderNode  child1 = new RenderNode("org.eclipse.jsf.jst.CompType2", "a");
-        RenderNode  child2 = new RenderNode("org.eclipse.jst.jst.CompType3", "br");
-        
-        _renderNode.getChildren().add(child1);
-        _renderNode.getChildren().add(child2);
-        
-        assertEquals(2, _renderNode.getChildren().size());
-        verifySame(child1, (RenderNode) _renderNode.getChildren().get(0));
-        verifySame(child2, (RenderNode) _renderNode.getChildren().get(1));
-    }
-
-    public void testGetRenderedNodeName() {
-        assertEquals("th", _renderNode.getRenderedNodeName());
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testGetRenderedAttributes() {
-        RenderAttribute  attribute1 = new RenderAttribute("id", "blah", null);
-        
-        _renderNode.getRenderedAttributes().add(attribute1);
-        
-        RenderAttribute attribute2 = new RenderAttribute("value", "5", "Value");
-        _renderNode.getRenderedAttributes().add(attribute2);
-        
-        verifySame(attribute1, (RenderAttribute)_renderNode.getRenderedAttributes().get(0));
-        verifySame(attribute2, (RenderAttribute)_renderNode.getRenderedAttributes().get(1));
-    }
-
-    public static void verifySame(RenderNode truth, RenderNode check)
-    {
-        if (truth == check) return;
-        
-        assertEquals(truth.getComponentId(), check.getComponentId());
-        assertEquals(truth.getRenderedNodeName(), check.getRenderedNodeName());
-
-        assertEquals(truth.getChildren().size(), check.getChildren().size());
-        
-        for (int i = 0; i < check.getChildren().size(); i++)
-        {
-            verifySame((RenderNode)truth.getChildren().get(i), (RenderNode)check.getChildren().get(i));
-        }
-        
-        assertEquals(truth.getRenderedAttributes().size(), check.getChildren().size());
-        
-        for (int i = 0; i < check.getRenderedAttributes().size(); i++)
-        {
-            verifySame((RenderAttribute)truth.getRenderedAttributes().get(i), 
-                       (RenderAttribute)check.getRenderedAttributes().get(i));
-        }
-    }
-    
-    public static void verifySame(RenderAttribute truth, RenderAttribute check)
-    {
-        assertEquals(truth.getName(), check.getName());
-        assertEquals(truth.getPropertyName(), check.getPropertyName());
-        assertEquals(truth.getValue(), check.getValue());
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/RuntimeTestUtil.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/RuntimeTestUtil.java
deleted file mode 100644
index 3e1bfad..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/RuntimeTestUtil.java
+++ /dev/null
@@ -1,892 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject;
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.DataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSource2Info;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSourceInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IEditableValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UICommandInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIDataInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIFormInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIInputInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIOutputInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ComponentDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.Decorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.FacetDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorTypeInfo;
-
-public final class RuntimeTestUtil extends Assert
-{
-    // expected type info for jsf/core components
-    public static final ComponentTypeInfo COMPINFO_PARAM = new ComponentTypeInfo(
-            "javax.faces.Parameter", "javax.faces.component.UIParameter",
-            new String[]
-            { "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.Parameter",
-            null);
-
-    public static final ComponentTypeInfo COMPINFO_SELECTITEM = new ComponentTypeInfo(
-            "javax.faces.SelectItem", "javax.faces.component.UISelectItem",
-            new String[]
-            { "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.SelectItem",
-            null);
-
-    public static final ComponentTypeInfo COMPINFO_SELECTITEMS = new ComponentTypeInfo(
-            "javax.faces.SelectItems", "javax.faces.component.UISelectItems",
-            new String[]
-            { "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", },
-            "javax.faces.SelectItems", null);
-
-    public static final ComponentTypeInfo COMPINFO_SUBVIEW = new ComponentTypeInfo(
-            "javax.faces.NamingContainer",
-            "javax.faces.component.UINamingContainer", new String[]
-            { "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.NamingContainer",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.NamingContainer", null);
-
-    public static final ComponentTypeInfo COMPINFO_VERBATIM = new ComponentTypeInfo(
-            "javax.faces.Output", "javax.faces.component.UIOutput",
-            new String[]
-            { "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.Output", "javax.faces.Text");
-
-    public static final ComponentTypeInfo COMPINFO_VIEW = new ComponentTypeInfo(
-            "javax.faces.ViewRoot", "javax.faces.component.UIViewRoot",
-            new String[]
-            { "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.ViewRoot",
-            null);
-
-    // expected type info for jsf/html components
-    public static final ComponentTypeInfo COMPINFO_COLUMN = new ComponentTypeInfo(
-            "javax.faces.Column", "javax.faces.component.UIColumn",
-            new String[]
-            { "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object" },
-            new String[]
-            { "javax.faces.component.StateHolder" }, "javax.faces.Column", null);
-    public static final ComponentTypeInfo COMPINFO_COMMAND = new ComponentTypeInfo(
-            "javax.faces.HtmlCommandButton",
-            "javax.faces.component.html.HtmlCommandButton", new String[]
-            { "javax.faces.component.UICommand",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object" },
-            new String[]
-            { "javax.faces.component.ActionSource",
-                    "javax.faces.component.StateHolder" },
-            "javax.faces.Command", "javax.faces.Button");
-    public static final ComponentTypeInfo COMPINFO_COMMANDLINK = new ComponentTypeInfo(
-            "javax.faces.HtmlCommandLink",
-            "javax.faces.component.html.HtmlCommandLink",
-            new String[]
-                       { "javax.faces.component.UICommand",
-                               "javax.faces.component.UIComponentBase",
-                               "javax.faces.component.UIComponent", "java.lang.Object" },
-                       new String[]
-                       { "javax.faces.component.ActionSource",
-                               "javax.faces.component.StateHolder" },
-                       "javax.faces.Command", "javax.faces.Link");
-    public static final ComponentTypeInfo COMPINFO_DATATABLE = new ComponentTypeInfo(
-            "javax.faces.HtmlDataTable",
-            "javax.faces.component.html.HtmlDataTable", new String[]
-            { "javax.faces.component.UIData",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object" },
-            new String[]
-            { "javax.faces.component.NamingContainer",
-                    "javax.faces.component.StateHolder", }, "javax.faces.Data",
-            "javax.faces.Table");
-    public static final ComponentTypeInfo COMPINFO_FORM = new ComponentTypeInfo(
-            "javax.faces.HtmlForm", "javax.faces.component.html.HtmlForm",
-            new String[]
-            { "javax.faces.component.UIForm",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object" },
-            new String[]
-            { "javax.faces.component.NamingContainer",
-                    "javax.faces.component.StateHolder" }, "javax.faces.Form",
-            "javax.faces.Form");
-    public static final ComponentTypeInfo COMPINFO_GRAPHIC = new ComponentTypeInfo(
-            "javax.faces.HtmlGraphicImage",
-            "javax.faces.component.html.HtmlGraphicImage", new String[]
-            { "javax.faces.component.UIGraphic",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.Graphic",
-            "javax.faces.Image");
-    public static final ComponentTypeInfo COMPINFO_HIDDEN = new ComponentTypeInfo(
-            "javax.faces.HtmlInputHidden",
-            "javax.faces.component.html.HtmlInputHidden", new String[]
-            { "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.Input", "javax.faces.Hidden");
-    public static final ComponentTypeInfo COMPINFO_SECRET = new ComponentTypeInfo(
-            "javax.faces.HtmlInputSecret",
-            "javax.faces.component.html.HtmlInputSecret", new String[]
-            { "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder" }, "javax.faces.Input",
-            "javax.faces.Secret");
-    public static final ComponentTypeInfo COMPINFO_INPUTTEXT = new ComponentTypeInfo(
-            "javax.faces.HtmlInputText",
-            "javax.faces.component.html.HtmlInputText", new String[]
-            { "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object" },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder" }, "javax.faces.Input",
-            "javax.faces.Text");
-    public static final ComponentTypeInfo COMPINFO_INPUTTEXTAREA = new ComponentTypeInfo(
-            "javax.faces.HtmlInputTextarea",
-            "javax.faces.component.html.HtmlInputTextarea", new String[]
-            { "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.Input", "javax.faces.Textarea");
-    public static final ComponentTypeInfo COMPINFO_MESSAGE = new ComponentTypeInfo(
-            "javax.faces.HtmlMessage",
-            "javax.faces.component.html.HtmlMessage", new String[]
-            { "javax.faces.component.UIMessage",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.Message",
-            "javax.faces.Message");
-    public static final ComponentTypeInfo COMPINFO_MESSAGES = new ComponentTypeInfo(
-            "javax.faces.HtmlMessages",
-            "javax.faces.component.html.HtmlMessages", new String[]
-            { "javax.faces.component.UIMessages",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.Messages",
-            "javax.faces.Messages");
-    public static final ComponentTypeInfo COMPINFO_OUTPUTFORMAT = new ComponentTypeInfo(
-            "javax.faces.HtmlOutputFormat",
-            "javax.faces.component.html.HtmlOutputFormat", new String[]
-            { "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.Output", "javax.faces.Format");
-    public static final ComponentTypeInfo COMPINFO_OUTPUTLABEL = new ComponentTypeInfo(
-            "javax.faces.HtmlOutputLabel",
-            "javax.faces.component.html.HtmlOutputLabel", new String[]
-            { "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.Output", "javax.faces.Label");
-    public static final ComponentTypeInfo COMPINFO_OUTPUTLINK = new ComponentTypeInfo(
-            "javax.faces.HtmlOutputLink",
-            "javax.faces.component.html.HtmlOutputLink", new String[]
-            { "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.Output", "javax.faces.Link");
-    public static final ComponentTypeInfo COMPINFO_OUTPUTTEXT = new ComponentTypeInfo(
-            "javax.faces.HtmlOutputText",
-            "javax.faces.component.html.HtmlOutputText", new String[]
-            { "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.Output", "javax.faces.Text");
-    public static final ComponentTypeInfo COMPINFO_PANELGRID = new ComponentTypeInfo(
-            "javax.faces.HtmlPanelGrid",
-            "javax.faces.component.html.HtmlPanelGrid", new String[]
-            { "javax.faces.component.UIPanel",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.Panel",
-            "javax.faces.Grid");
-    public static final ComponentTypeInfo COMPINFO_PANELGROUP = new ComponentTypeInfo(
-            "javax.faces.HtmlPanelGroup",
-            "javax.faces.component.html.HtmlPanelGroup", new String[]
-            { "javax.faces.component.UIPanel",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.StateHolder", }, "javax.faces.Panel",
-            "javax.faces.Group");
-    public static final ComponentTypeInfo COMPINFO_SELECTBOOLEANCHECKBOX = new ComponentTypeInfo(
-            "javax.faces.HtmlSelectBooleanCheckbox",
-            "javax.faces.component.html.HtmlSelectBooleanCheckbox",
-            new String[]
-            { "javax.faces.component.UISelectBoolean",
-                    "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.SelectBoolean", "javax.faces.Checkbox");
-    public static final ComponentTypeInfo COMPINFO_SELECTMANYCHECKBOX = new ComponentTypeInfo(
-            "javax.faces.HtmlSelectManyCheckbox",
-            "javax.faces.component.html.HtmlSelectManyCheckbox", new String[]
-            { "javax.faces.component.UISelectMany",
-                    "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.SelectMany", "javax.faces.Checkbox");
-    public static final ComponentTypeInfo COMPINFO_SELECTMANYLISTBOX = new ComponentTypeInfo(
-            "javax.faces.HtmlSelectManyListbox",
-            "javax.faces.component.html.HtmlSelectManyListbox", new String[]
-            { "javax.faces.component.UISelectMany",
-                    "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.SelectMany", "javax.faces.Listbox");
-    public static final ComponentTypeInfo COMPINFO_SELECTMANYMENU = new ComponentTypeInfo(
-            "javax.faces.HtmlSelectManyMenu",
-            "javax.faces.component.html.HtmlSelectManyMenu", new String[]
-            { "javax.faces.component.UISelectMany",
-                    "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.SelectMany", "javax.faces.Menu");
-    public static final ComponentTypeInfo COMPINFO_SELECTONELISTBOX = new ComponentTypeInfo(
-            "javax.faces.HtmlSelectOneListbox",
-            "javax.faces.component.html.HtmlSelectOneListbox", new String[]
-            { "javax.faces.component.UISelectOne",
-                    "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.SelectOne", "javax.faces.Listbox");
-    public static final ComponentTypeInfo COMPINFO_SELECTONEMENU = new ComponentTypeInfo(
-            "javax.faces.HtmlSelectOneMenu",
-            "javax.faces.component.html.HtmlSelectOneMenu", new String[]
-            { "javax.faces.component.UISelectOne",
-                    "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.SelectOne", "javax.faces.Menu");
-    public static final ComponentTypeInfo COMPINFO_SELECTONERADIO = new ComponentTypeInfo(
-            "javax.faces.HtmlSelectOneRadio",
-            "javax.faces.component.html.HtmlSelectOneRadio", new String[]
-            { "javax.faces.component.UISelectOne",
-                    "javax.faces.component.UIInput",
-                    "javax.faces.component.UIOutput",
-                    "javax.faces.component.UIComponentBase",
-                    "javax.faces.component.UIComponent", "java.lang.Object", },
-            new String[]
-            { "javax.faces.component.EditableValueHolder",
-                    "javax.faces.component.ValueHolder",
-                    "javax.faces.component.StateHolder", },
-            "javax.faces.SelectOne", "javax.faces.Radio");
-
-    // default converters
-    public static final ConverterTypeInfo CONVERTERINFO_DATETIME = new ConverterTypeInfo(
-            "javax.faces.convert.DateTimeConverter", "javax.faces.DateTime");
-
-    public static final ConverterTypeInfo CONVERTERINFO_NUMBER = new ConverterTypeInfo(
-            "javax.faces.convert.NumberConverter", "javax.faces.Number");
-
-    // default validators
-    public static final ValidatorTypeInfo VALIDATORINFO_DOUBLERANGE = new ValidatorTypeInfo(
-            "javax.faces.validator.DoubleRangeValidator",
-            "javax.faces.DoubleRange");
-
-    public static final ValidatorTypeInfo VALIDATORINFO_LENGTH = new ValidatorTypeInfo(
-            "javax.faces.validator.LengthValidator", "javax.faces.Length");
-
-    public static final ValidatorTypeInfo VALIDATORINFO_LONGRANGE = new ValidatorTypeInfo(
-            "javax.faces.validator.LongRangeValidator", "javax.faces.LongRange");
-
-    // public static final ValidatorTypeInfo VALIDATORINFO_METHODEXPRESSION =
-    // new ValidatorTypeInfo(
-    // "javax.faces.validator.MethodExpressionValidator ",
-    // "javax.faces.LongRange");
-
-    @SuppressWarnings("unchecked")
-    public static <COMPONENT_T> COMPONENT_T serializeDeserialize(
-            final COMPONENT_T object) throws IOException,
-            ClassNotFoundException
-    {
-        final ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-        final ObjectOutputStream outStream = new ObjectOutputStream(byteStream);
-
-        outStream.writeObject(object);
-
-        final ByteArrayInputStream byteArray = new ByteArrayInputStream(
-                byteStream.toByteArray());
-        final ObjectInputStream inStream = new ObjectInputStream(byteArray);
-
-        return (COMPONENT_T) inStream.readObject();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void verifyImplicitAdapter(final ViewObject check,
-            final Class adapterType, final Object explicitAdapter)
-    {
-        assertEquals(check, check.getAdapter(adapterType));
-        // cannot add explicit adapter if check is already that type
-        boolean caughtException = false;
-        
-        try
-        {
-            check.addAdapter(adapterType, explicitAdapter);
-        }
-        catch (IllegalArgumentException iae)
-        {
-            caughtException = true;
-        }
-        
-        assertTrue(caughtException);
-
-        // should be unaffected by the attempt
-        assertEquals(check, check.getAdapter(adapterType));
-    }
-
-    public static void verifySame(final ComponentTypeInfo truth,
-            final ComponentTypeInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getClassName(), check.getClassName());
-        assertEquals(truth.getComponentFamily(), check.getComponentFamily());
-        assertEquals(truth.getComponentType(), check.getComponentType());
-        assertEquals(truth.getRenderFamily(), check.getRenderFamily());
-        
-        verifyArraysSame(truth.getInterfaces(), check.getInterfaces());
-        verifyArraysSame(truth.getSuperClasses(), check.getSuperClasses());
-    }
-
-    public static <T> void verifyArraysSame(T[]  expected, T[] check)
-    {
-        assertEquals("Arrays must be same size", expected.length, check.length);
-        
-        Set<T>  expectedValues = new HashSet<T>();
-        
-        for (final T e : expected)
-        {
-            expectedValues.add(e);
-        }
-        
-        for (final T e : check)
-        {
-            assertTrue("Must contain "+e,expectedValues.contains(e));
-        }
-    }
-    
-    public static void verifySame(final DataModelInfo truth,
-            final DataModelInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getRowCount(), check.getRowCount());
-        assertEquals(truth.getRowIndex(), check.getRowIndex());
-
-        // assertEquals(truth.getRowData(), check.getRowData());
-        // assertEquals(truth.getWrappedData(), check.getWrappedData());
-    }
-
-    public static void verifySame(final ViewObject truth, final ViewObject check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getAllDecorators().size(), check.getAllDecorators()
-                .size());
-
-        for (int i = 0; i < check.getAllDecorators().size(); i++)
-        {
-            verifySame((Decorator) truth.getAllDecorators().get(i),
-                    (Decorator) check.getAllDecorators().get(i));
-        }
-
-        // TODO: hard to check adapters since they are arbitrary
-        assertEquals(truth.getAllAdapters().size(), truth.getAllAdapters()
-                .size());
-        // can at least check that the keys match
-        assertEquals(truth.getAllAdapters().keySet(), check.getAllAdapters()
-                .keySet());
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void verifySame(final ComponentInfo truth,
-            final ComponentInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((ViewObject) truth, (ViewObject) check);
-        verifySame(truth.getComponentTypeInfo(), check.getComponentTypeInfo());
-
-        assertEquals(truth.getId(), check.getId());
-        assertEquals(truth.isRendered(), check.isRendered());
-//        assertEquals(truth.getMostSpecificComponentName(), check
-//                .getMostSpecificComponentName());
-        // assertEquals(truth.getParent(), t);
-        // TestRenderNode.verifySame(truth.getRenderNode(),
-        // check.getRenderNode());
-
-        assertEquals(truth.getChildren().size(), check.getChildren().size());
-
-        for (int i = 0; i < check.getChildren().size(); i++)
-        {
-            final ComponentInfo checkChild = (ComponentInfo) check
-                    .getChildren().get(i);
-            verifySame((ComponentInfo) truth.getChildren().get(i), checkChild);
-        }
-
-        final List truthGetAllDecorators = truth.getAllDecorators();
-        final List checkGetAllDecorators = check.getAllDecorators();
-
-        for (int i = 0; i < checkGetAllDecorators.size(); i++)
-        {
-            final Decorator checkDecorator = (Decorator) checkGetAllDecorators
-                    .get(i);
-
-            verifySame((Decorator) truthGetAllDecorators.get(i), checkDecorator);
-        }
-    }
-
-    public static void verifySame(final UIOutputInfo truth,
-            final UIOutputInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((ComponentInfo) truth, (ComponentInfo) check);
-        verifySame((IValueHolderInfo) truth, (IValueHolderInfo) check);
-    }
-
-    public static void verifySame(final UIInputInfo truth,
-            final UIInputInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((UIOutputInfo) truth, (UIOutputInfo) check);
-        verifySame((IEditableValueHolderInfo) truth,
-                (IEditableValueHolderInfo) check);
-    }
-
-    public static void verifySame(final UICommandInfo truth,
-            final UICommandInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((ComponentInfo) truth, (ComponentInfo) check);
-        verifySame((IActionSourceInfo) truth, (IActionSourceInfo) check);
-    }
-
-    public static void verifySame(final UIFormInfo truth, final UIFormInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((ComponentInfo) truth, (ComponentInfo) check);
-        assertEquals(truth.isPrependId(), check.isPrependId());
-        assertEquals(truth.isSubmitted(), check.isSubmitted());
-    }
-
-    public static void verifySame(final UIDataInfo truth, final UIDataInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((ComponentInfo) truth, (ComponentInfo) check);
-
-        assertEquals(truth.getFirst(), check.getFirst());
-        assertEquals(truth.getRowCount(), check.getRowCount());
-        assertEquals(truth.isRowAvailable(), check.isRowAvailable());
-        assertEquals(truth.getRowIndex(), check.getRowIndex());
-        assertEquals(truth.getRows(), check.getRows());
-        assertEquals(truth.getVar(), check.getVar());
-    }
-
-    public static void verifySame(final Decorator truth, final Decorator check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getClass(), check.getClass());
-
-        verifySame((ViewObject) truth, (ViewObject) check);
-
-        if (truth instanceof FacetDecorator)
-        {
-            verifySame((FacetDecorator) truth, (FacetDecorator) check);
-        }
-        else if (truth instanceof ActionListenerDecorator)
-        {
-            verifySame((ActionListenerDecorator) truth,
-                    (ActionListenerDecorator) check);
-        }
-        else if (truth instanceof ValidatorDecorator)
-        {
-            verifySame((ValidatorDecorator) truth, (ValidatorDecorator) check);
-        }
-        else if (truth instanceof ConverterDecorator)
-        {
-            verifySame((ConverterDecorator) truth, (ConverterDecorator) check);
-        }
-        else if (truth instanceof ComponentDecorator)
-        {
-            verifySame((ComponentDecorator) truth, (ComponentDecorator) check);
-        }
-    }
-
-    private static void verifySame(final ComponentDecorator truth,
-            final ComponentDecorator check)
-    {
-        verifySame(truth.getDecorates(), check.getDecorates());
-    }
-
-    private static void verifySame(final ActionListenerDecorator truth,
-            final ActionListenerDecorator check)
-    {
-        verifySame((ComponentDecorator) truth, (ComponentDecorator) check);
-    }
-
-    private static void verifySame(final FacetDecorator truth,
-            final FacetDecorator check)
-    {
-        verifySame((ComponentDecorator) truth, (ComponentDecorator) check);
-        assertEquals(truth.getName(), check.getName());
-    }
-
-    private static void verifySame(final ConverterDecorator truth,
-            final ConverterDecorator check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((ComponentDecorator) truth, (ComponentDecorator) check);
-    }
-
-    public static void verifySame(final ConverterTypeInfo truth,
-            final ConverterTypeInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getClassName(), check.getClassName());
-        assertEquals(truth.getConverterId(), check.getConverterId());
-    }
-
-    private static void verifySame(final ValidatorDecorator truth,
-            final ValidatorDecorator check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((ComponentDecorator) truth, (ComponentDecorator) check);
-    }
-
-    public static void verifySame(final ValidatorTypeInfo truth,
-            final ValidatorTypeInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getClassName(), check.getClassName());
-        assertEquals(truth.getValidatorId(), check.getValidatorId());
-    }
-
-    public static ComponentTypeInfo createComponentTypeInfo()
-    {
-        return new ComponentTypeInfo("org.eclipse.jst.jsf.test",
-                "org.eclipse.jst.jsf.test.ComponentClass",
-                "org.eclipse.jst.jsf.test.ComponentFamily",
-                "org.eclipse.jst.jsf.test.RenderFamily");
-    }
-
-    public static void verifySame(final IValueHolderInfo truth,
-            final IValueHolderInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getLocalValue(), check.getLocalValue());
-        assertEquals(truth.getValue(), check.getValue());
-        verifySame(truth.getConverter(), check.getConverter());
-    }
-
-    public static void verifySame(final IEditableValueHolderInfo truth,
-            final IEditableValueHolderInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        verifySame((IValueHolderInfo) truth, (IValueHolderInfo) check);
-
-        assertEquals(truth.isImmediate(), truth.isImmediate());
-        assertEquals(truth.isLocalSetValue(), truth.isLocalSetValue());
-        assertEquals(truth.isRequired(), truth.isRequired());
-        assertEquals(truth.isValid(), truth.isValid());
-
-        assertEquals(truth.getSubmittedValue(), check.getSubmittedValue());
-        assertEquals(truth.getValidator(), check.getValidator());
-        assertEquals(truth.getValueChangeListener(), truth
-                .getValueChangeListener());
-
-        // check validators
-        assertEquals(truth.getValidators().size(), check.getValidators().size());
-
-        for (int i = 0; i < check.getValidators().size(); i++)
-        {
-            verifySame((Decorator) truth.getValidators().get(i),
-                    (Decorator) check.getValidators().get(i));
-        }
-
-        for (int i = 0; i < check.getValueChangeListeners().size(); i++)
-        {
-            verifySame((Decorator) truth.getValidators().get(i),
-                    (Decorator) check.getValidators().get(i));
-        }
-    }
-
-    public static void verifySame(final IActionSourceInfo truth,
-            final IActionSourceInfo check)
-    {
-        if (truth == check)
-        {
-            return;
-        }
-
-        // the only way having truth or check null is valid is if
-        // the are both null, which we check above
-        assertNotNull(truth);
-        assertNotNull(check);
-
-        assertEquals(truth.getAction(), check.getAction());
-        assertEquals(truth.getActionListener(), check.getActionListener());
-        assertEquals(truth.isImmediate(), check.isImmediate());
-
-        if (truth instanceof IActionSource2Info)
-        {
-            assertTrue(check instanceof IActionSource2Info);
-            assertEquals(((IActionSource2Info) truth).getActionExpression(),
-                    ((IActionSource2Info) check).getActionExpression());
-        }
-
-        // check action listener
-        assertEquals(truth.getActionListeners().size(), check
-                .getActionListeners().size());
-
-        for (int i = 0; i < check.getActionListeners().size(); i++)
-        {
-            verifySame((Decorator) truth.getActionListeners().get(i),
-                    (Decorator) check.getActionListeners().get(i));
-        }
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/TestViewObject.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/TestViewObject.java
deleted file mode 100644
index a893e0b..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/TestViewObject.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model;
-
-import java.io.Serializable;
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.Decorator;
-
-public class TestViewObject extends TestCase
-{
-
-    private MockAdapter _adapter1;
-    private MockAdapter _adapter2;
-    private MockDecorator _decorator1;
-    private MockDecorator _decorator2;
-    private ViewObject _viewObject1;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        _decorator1 = new MockDecorator();
-        _decorator2 = new MockDecorator();
-        _adapter1 = new MockAdapter();
-        _adapter2 = new MockAdapter();
-        _viewObject1 = new MockViewObject();
-    }
-
-    @Override
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testGetAllDecorators()
-    {
-        // we have not added anything so we should get an empty
-        // immutable list
-        List allDecorators = _viewObject1.getAllDecorators();
-        assertSizeAndImmutable(allDecorators, 0);
-
-        // add the decorators; use different keys
-        _viewObject1.addDecorator(_decorator1, Decorator.class);
-        _viewObject1.addDecorator(_decorator2, String.class);
-
-        allDecorators = _viewObject1.getAllDecorators();
-
-        assertSizeAndImmutable(allDecorators, 2);
-
-        assertTrue(allDecorators.contains(_decorator1));
-        assertTrue(allDecorators.contains(_decorator2));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testGetAllAdapters()
-    {
-        // we have not added anything so we should get an empty
-        // immutable list
-        Map allAdapters = _viewObject1.getAllAdapters();
-        assertSizeAndImmutable(allAdapters, 0);
-
-        // add the decorators; use different keys
-        // _viewObject1.addAdapter(Object.class, _adapter1);
-        _viewObject1.addAdapter(MockAdapter.class, _adapter2);
-
-        allAdapters = _viewObject1.getAllAdapters();
-
-        assertSizeAndImmutable(allAdapters, 1);
-
-        //assertEquals(_adapter1, allAdapters.get(Object.class));
-        assertEquals(_adapter2, allAdapters.get(MockAdapter.class));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testGetDecorators()
-    {
-        // haven't added anything yet, so all should be empty immutable
-        assertSizeAndImmutable(_viewObject1.getDecorators(Decorator.class), 0);
-        assertSizeAndImmutable(_viewObject1.getDecorators(MockDecorator.class),
-                0);
-        assertSizeAndImmutable(_viewObject1.getDecorators(String.class), 0);
-
-        // just add using self class key
-        _viewObject1.addDecorator(_decorator1);
-        _viewObject1.addDecorator(_decorator2);
-
-        List decorators = _viewObject1.getDecorators(_decorator1.getClass());
-        assertSizeAndImmutable(decorators, 2);
-        assertTrue(decorators.contains(_decorator1));
-        assertTrue(decorators.contains(_decorator2));
-
-        // wrong key
-        assertFalse(_viewObject1.removeDecorator(_decorator1, Decorator.class));
-        assertSizeAndImmutable(decorators, 2);
-
-        // right keys
-        assertTrue(_viewObject1.removeDecorator(_decorator1, _decorator1
-                .getClass()));
-        assertTrue(_viewObject1.removeDecorator(_decorator2, _decorator1
-                .getClass()));
-        assertSizeAndImmutable(decorators, 0);
-
-        // reset view Object and do the same with direct class keys
-        _viewObject1 = new MockViewObject();
-
-        _viewObject1.addDecorator(_decorator1, MockDecorator.class);
-        _viewObject1.addDecorator(_decorator2, MockDecorator.class);
-
-        decorators = _viewObject1.getDecorators(_decorator1.getClass());
-        assertSizeAndImmutable(decorators, 2);
-        assertTrue(decorators.contains(_decorator1));
-        assertTrue(decorators.contains(_decorator2));
-
-        assertTrue(_viewObject1.removeDecorator(_decorator1, _decorator1
-                .getClass()));
-        assertTrue(_viewObject1.removeDecorator(_decorator2, _decorator1
-                .getClass()));
-        assertSizeAndImmutable(decorators, 0);
-
-        // store under different keys
-        _viewObject1 = new MockViewObject();
-
-        _viewObject1.addDecorator(_decorator1, Decorator.class);
-        _viewObject1.addDecorator(_decorator2);
-
-        // should only be on since _decorator2 was added under its own class
-        decorators = _viewObject1.getDecorators(Decorator.class);
-        assertSizeAndImmutable(decorators, 1);
-        assertTrue(decorators.contains(_decorator1));
-
-        decorators = _viewObject1.getDecorators(MockDecorator.class);
-        assertSizeAndImmutable(decorators, 1);
-        assertTrue(decorators.contains(_decorator2));
-    }
-
-    public void testNullDecoratorArgs()
-    {
-        boolean isOk = false;
-        // try to add a null decorator
-        try
-        {
-            _viewObject1.addDecorator(null);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            isOk = true;
-        }
-        assertTrue(isOk);
-        assertTrue(_viewObject1.getDecorators(null).isEmpty());
-
-        // try to add a decorator with a null class
-        isOk = false;
-        try
-        {
-            _viewObject1.addDecorator(_decorator1, null);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            isOk = true;
-        }
-        assertTrue(isOk);
-        assertTrue(_viewObject1.getDecorators(null).isEmpty());
-
-        // try to remove null decorator
-        isOk = false;
-        try
-        {
-            _viewObject1.removeDecorator(null, Decorator.class);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            isOk = true;
-        }
-        assertTrue(isOk);
-        // try to remove decorator with null key
-        isOk = false;
-        try
-        {
-            _viewObject1.removeDecorator(_decorator1, null);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            isOk = true;
-        }
-        assertTrue(isOk);
-    }
-
-    public void testGetAdapter()
-    {
-        // should have no adapters
-        assertNull(_viewObject1.getAdapter(MockAdapter.class));
-        assertNull(_viewObject1.getAdapter(String.class));
-        assertNull(_viewObject1.getAdapter(MockDecorator.class));
-
-        // now add the adapters under the same keys
-        _viewObject1.addAdapter(MockAdapter.class, _adapter1);
-        assertEquals(_adapter1, _viewObject1.getAdapter(MockAdapter.class));
-        _viewObject1.addAdapter(MockAdapter.class, _adapter2);
-        assertEquals(_adapter2, _viewObject1.getAdapter(MockAdapter.class));
-
-        // now try class and sub-class
-        _viewObject1.addAdapter(MockDecorator.class, _decorator1);
-        assertEquals(_decorator1, _viewObject1.getAdapter(MockDecorator.class));
-        assertNull(_viewObject1.getAdapter(Decorator.class));
-        assertEquals(_decorator1, _viewObject1
-                .removeAdapter(MockDecorator.class));
-        // ok to add as a decorator because MockDecorator -> Decorator
-        _viewObject1.addAdapter(Decorator.class, _decorator1);
-        assertEquals(_decorator1, _viewObject1.getAdapter(Decorator.class));
-        // this was removed above and should have been readded
-        assertNull(_viewObject1.getAdapter(MockDecorator.class));
-        assertEquals(_decorator1, _viewObject1.removeAdapter(Decorator.class));
-
-        // test assertion conditions
-        boolean assertionOk = false;
-        try
-        {
-            // try to use a null class
-            _viewObject1.addAdapter(null, _decorator1);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            assertionOk = true;
-        }
-
-        assertTrue(assertionOk);
-        assertNull(_viewObject1.getAdapter(null));
-
-        assertionOk = false;
-        // try to use null object
-        try
-        {
-            _viewObject1.addAdapter(Decorator.class, null);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            assertionOk = true;
-        }
-        assertTrue(assertionOk);
-
-        assertionOk = false;
-        // try adding a class that is not an instance of the interface key
-        try
-        {
-            _viewObject1.addAdapter(Decorator.class, _adapter1);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            assertionOk = true;
-        }
-
-        assertTrue(assertionOk);
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testDefaultAdapterBehaviour()
-    {
-        // by default, the view object will return its "this" object
-        // if it is an instance of a requested class, even if it has
-        // this in its adapter list.
-        final ViewObject viewObject1 = new MockViewObject();
-        final ViewObject listViewObject1 = new MockViewObjectImplementsList();
-
-        final List listAdapter = new ArrayList();
-
-        // with the non-list, get adapter will return something only if it is
-        // added
-        assertNull(viewObject1.getAdapter(List.class));
-        viewObject1.addAdapter(List.class, listAdapter);
-        assertEquals(listAdapter, viewObject1.getAdapter(List.class));
-        assertEquals(listAdapter, viewObject1.removeAdapter(List.class));
-        assertNull(viewObject1.getAdapter(List.class));
-
-        // however, with the viewObject that is a list...
-        assertEquals(listViewObject1, listViewObject1.getAdapter(List.class));
-
-        boolean caughtException = false;
-        // can't add an interface to an object already of that type
-        try
-        {
-            listViewObject1.addAdapter(List.class, listAdapter);
-        }
-        catch (final IllegalArgumentException iae)
-        {
-            caughtException = true;
-        }
-
-        assertTrue(caughtException);
-        // should be unaffected
-        assertEquals(listViewObject1, listViewObject1.getAdapter(List.class));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testGetDecoratorMap()
-    {
-        // check contract: getDecoratorMap should never return null
-        // and should always return the same map
-        final Map map = ((MockViewObject) _viewObject1).getDecoratorMap();
-        assertNotNull(map);
-        assertEquals(map, ((MockViewObject) _viewObject1).getDecoratorMap());
-        assertEquals(map, ((MockViewObject) _viewObject1).getDecoratorMap());
-        assertEquals(map, ((MockViewObject) _viewObject1).getDecoratorMap());
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testGetAdapterMap()
-    {
-        // check contract: getAdapterMap should never return null
-        // and should always return the same map
-        final Map map = ((MockViewObject) _viewObject1).getAdapterMap();
-        assertNotNull(map);
-        assertEquals(map, ((MockViewObject) _viewObject1).getAdapterMap());
-        assertEquals(map, ((MockViewObject) _viewObject1).getAdapterMap());
-        assertEquals(map, ((MockViewObject) _viewObject1).getAdapterMap());
-
-    }
-
-    public void testSerializable() throws Exception
-    {
-        _viewObject1.addDecorator(_decorator1);
-        _viewObject1.addDecorator(_decorator2, Decorator.class);
-        _viewObject1.addAdapter(MockAdapter.class, _adapter1);
-
-        final ViewObject deserialized = RuntimeTestUtil
-        .serializeDeserialize(_viewObject1);
-
-        RuntimeTestUtil.verifySame(_viewObject1, deserialized);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void assertSizeAndImmutable(final List list, final int size)
-    {
-        assertEquals(size, list.size());
-        // in the default case, the list should throw an exception
-        // on modification
-        boolean isListImmutable = false;
-        try
-        {
-            list.add(new MockDecorator());
-        }
-        catch (final Exception e)
-        {
-            // success
-            isListImmutable = true;
-        }
-        assertTrue(isListImmutable);
-        // since immutable, should not have changed
-        assertEquals(size, list.size());
-    }
-
-    @SuppressWarnings("unchecked")
-    private void assertSizeAndImmutable(final Map map, final int size)
-    {
-        assertEquals(size, map.size());
-        // in the default case, the list should throw an exception
-        // on modification
-        boolean isMapImmutable = false;
-        try
-        {
-            map.put(new Object(), new MockDecorator());
-        }
-        catch (final Exception e)
-        {
-            // success
-            isMapImmutable = true;
-        }
-        assertTrue(isMapImmutable);
-        // since immutable, should not have changed
-        assertEquals(size, map.size());
-    }
-
-    public static class MockViewObject extends ViewObject
-    {
-        /**
-         * 
-         */
-        private static final long serialVersionUID = 5839704536769825171L;
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public Map getAdapterMap()
-        {
-            return super.getAdapterMap();
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public Map getDecoratorMap()
-        {
-            return super.getDecoratorMap();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static class MockViewObjectImplementsList extends ViewObject
-    implements List
-    {
-        /**
-         * 
-         */
-        private static final long serialVersionUID = -6379202834709723049L;
-
-        public boolean add(final Object o)
-        {
-            return false;
-        }
-
-        public void add(final int index, final Object element)
-        {
-
-        }
-
-        public boolean addAll(final Collection c)
-        {
-            return false;
-        }
-
-        public boolean addAll(final int index, final Collection c)
-        {
-            return false;
-        }
-
-        public void clear()
-        {
-
-        }
-
-        public boolean contains(final Object o)
-        {
-            return false;
-        }
-
-        public boolean containsAll(final Collection c)
-        {
-            return false;
-        }
-
-        public Object get(final int index)
-        {
-            return null;
-        }
-
-        public int indexOf(final Object o)
-        {
-            return 0;
-        }
-
-        public boolean isEmpty()
-        {
-            return false;
-        }
-
-        public Iterator iterator()
-        {
-            return null;
-        }
-
-        public int lastIndexOf(final Object o)
-        {
-            return 0;
-        }
-
-        public ListIterator listIterator()
-        {
-            return null;
-        }
-
-        public ListIterator listIterator(final int index)
-        {
-            return null;
-        }
-
-        public boolean remove(final Object o)
-        {
-            return false;
-        }
-
-        public Object remove(final int index)
-        {
-            return null;
-        }
-
-        public boolean removeAll(final Collection c)
-        {
-            return false;
-        }
-
-        public boolean retainAll(final Collection c)
-        {
-            return false;
-        }
-
-        public Object set(final int index, final Object element)
-        {
-            return null;
-        }
-
-        public int size()
-        {
-            return 0;
-        }
-
-        public List subList(final int fromIndex, final int toIndex)
-        {
-            return null;
-        }
-
-        public Object[] toArray()
-        {
-            return null;
-        }
-
-        public Object[] toArray(final Object[] a)
-        {
-            return null;
-        }
-
-    }
-
-    public static class MockDecorator extends Decorator
-    {
-
-        /**
-         * 
-         */
-        private static final long serialVersionUID = 456684865942628607L;
-
-    }
-
-    public static class MockAdapter implements Serializable
-    {
-
-        /**
-         * 
-         */
-        private static final long serialVersionUID = 424297135847238931L;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static class MockAdapterImplementsList extends AbstractList
-    {
-
-        @Override
-        public Object get(final int index)
-        {
-            return null;
-        }
-
-        @Override
-        public int size()
-        {
-            return 0;
-        }
-
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/bean/TestDataModelInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/bean/TestDataModelInfo.java
deleted file mode 100644
index 6ceaf0b..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/bean/TestDataModelInfo.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.bean;
-
-import java.io.Serializable;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.DataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestDataModelInfo extends TestCase {
-
-    private DataModelInfo _dataModelInfo;
-    private Object _rowDataObject;
-    private Object _wrappedDataObject;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _rowDataObject = new Object();
-        _wrappedDataObject = new Object();
-        _dataModelInfo = new DataModelInfo(true, -1, _rowDataObject, -1,
-                _wrappedDataObject);
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testIsRowAvailable() {
-        assertEquals(true, _dataModelInfo.isRowAvailable());
-    }
-
-    public void testGetRowCount() {
-        assertEquals(-1, _dataModelInfo.getRowCount());
-    }
-
-    public void testGetRowData() {
-        assertEquals(_rowDataObject, _dataModelInfo.getRowData());
-    }
-
-    public void testGetRowIndex() {
-        assertEquals(-1, _dataModelInfo.getRowIndex());
-    }
-
-    public void testGetWrappedData() {
-        assertEquals(_wrappedDataObject, _dataModelInfo.getWrappedData());
-    }
-
-    public void testSerializable() throws Exception {
-        DataModelInfo deserialized = RuntimeTestUtil
-                .serializeDeserialize(_dataModelInfo);
-        RuntimeTestUtil.verifySame(_dataModelInfo, deserialized);
-        
-        // if the object is not serializable, then the deserialize will be null
-        if (_dataModelInfo.getRowData() instanceof Serializable)
-        {
-            assertEquals(_dataModelInfo.getRowData(), deserialized.getRowData());
-        }
-        else
-        {
-            assertNull(deserialized.getRowData());
-        }
-        
-        // if the object is not serializable, then the deserialize will be null
-        if (_dataModelInfo.getWrappedData() instanceof Serializable)
-        {
-            assertEquals(_dataModelInfo.getWrappedData()
-                    , deserialized.getWrappedData());
-        }
-        else
-        {
-            assertNull(deserialized.getWrappedData());
-        }
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/behavioural/TestActionSource2Info.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/behavioural/TestActionSource2Info.java
deleted file mode 100644
index 530e240..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/behavioural/TestActionSource2Info.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.behavioural;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.ActionSourceInfo2;
-
-import junit.framework.TestCase;
-
-public class TestActionSource2Info extends TestCase {
-
-    private ActionSourceInfo2 _actionSource2;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _actionSource2 = new ActionSourceInfo2("com.Action",
-                "com.ActionListener", true, "com.ActionExpression");
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testGetActionExpression() {
-        assertEquals("com.ActionExpression", _actionSource2.getActionExpression());
-    }
-
-    public void testAddActionListener() {
-        
-    }
-
-    public void testGetAction() {
-        assertEquals("com.Action", _actionSource2.getAction());
-    }
-
-    public void testGetActionListener() {
-        assertEquals("com.ActionListener", _actionSource2.getActionListener());
-    }
-
-    public void testGetActionListeners() {
-        //fail("Not yet implemented");
-    }
-
-    public void testIsImmediate() {
-        assertTrue(_actionSource2.isImmediate());
-    }
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/behavioural/TestValueHolderInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/behavioural/TestValueHolderInfo.java
deleted file mode 100644
index 2d265d8..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/behavioural/TestValueHolderInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.behavioural;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.ValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestValueHolderInfo extends TestCase {
-
-    private ComponentInfo _componentInfo;
-    private ValueHolderInfo _valueHolder;
-    private ConverterTypeInfo  _converterTypeInfo;
-    private ConverterDecorator _converterDecorator;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _converterTypeInfo = ConverterTypeInfo.UNKNOWN;
-        _converterDecorator = new ConverterDecorator(_componentInfo, _converterTypeInfo);
-        _componentInfo = ComponentFactory.createComponentInfo("id", null, RuntimeTestUtil
-                .createComponentTypeInfo(), true);
-        _valueHolder = new ValueHolderInfo(_converterDecorator, "value", "value");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testGetValue() {
-        assertEquals("value", _valueHolder.getValue());
-    }
-
-    public void testGetLocalValue() {
-        assertEquals("value", _valueHolder.getLocalValue());
-    }
-
-    public void testGetConverter() {
-        RuntimeTestUtil.verifySame(_converterDecorator, _valueHolder.getConverter());
-        RuntimeTestUtil.verifySame(_converterTypeInfo, _valueHolder.getConverter().getTypeInfo());
-    }
-
-    public void testSerializable() throws Exception
-    {
-        final ValueHolderInfo   deserialized = 
-            RuntimeTestUtil.serializeDeserialize(_valueHolder);
-
-        RuntimeTestUtil.verifySame(_valueHolder, deserialized);
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/ComponentTestCase.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/ComponentTestCase.java
deleted file mode 100644
index ce8c87d..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/ComponentTestCase.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import junit.framework.TestCase;
-
-abstract class ComponentTestCase extends TestCase
-{
-    public abstract void testSerializable() throws Exception;
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestComponentInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestComponentInfo.java
deleted file mode 100644
index abf100a..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestComponentInfo.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.FacetDecorator;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestComponentInfo extends ComponentTestCase {
-
-    protected ComponentTypeInfo _componentTypeInfo;
-    private ComponentInfo _componentInfo;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _componentTypeInfo = RuntimeTestUtil.createComponentTypeInfo();
-
-        _componentInfo = ComponentFactory.createComponentInfo("id", null,
-                _componentTypeInfo, true);
-    }
-
-    public void testToString()
-    {
-        // just call it for now to get coverage.  toString should only 
-        // be used for diagnostics and dumps on these objects anyway...
-        System.out.println(getComponentInfo().toString());
-    }
-    
-    /**
-     * @return the main test component info. Override in child tests.
-     */
-    protected ComponentInfo getComponentInfo() {
-        return _componentInfo;
-    }
-
-    public void testGetId() {
-        assertEquals("id", getComponentInfo().getId());
-    }
-
-    public void testGetComponentTypeInfo() {
-        assertEquals(_componentTypeInfo, getComponentInfo()
-                .getComponentTypeInfo());
-    }
-
-    public void testIsRendered() {
-        assertTrue(getComponentInfo().isRendered());
-    }
-
-    public void testChildren() {
-        assertTrue(getComponentInfo().getChildren().isEmpty());
-        final ComponentInfo componentInfo = ComponentFactory
-                .createComponentInfo("id2", getComponentInfo(),
-                        _componentTypeInfo, true);
-        getComponentInfo().addChild(componentInfo);
-        assertEquals(1, getComponentInfo().getChildren().size());
-        RuntimeTestUtil.verifySame(componentInfo,
-                (ComponentInfo) getComponentInfo().getChildren().get(0));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testFacet() {
-        assertTrue(getComponentInfo().getChildren().isEmpty());
-        final ComponentInfo componentInfo = ComponentFactory
-                .createComponentInfo("id2", getComponentInfo(),
-                        _componentTypeInfo, true);
-        getComponentInfo().addFacet("header", componentInfo);
-        assertEquals(1, getComponentInfo().getChildren().size());
-        RuntimeTestUtil.verifySame(componentInfo,
-                (ComponentInfo) getComponentInfo().getChildren().get(0));
-        assertEquals("header", getComponentInfo().getFacetName(componentInfo));
-        assertEquals(componentInfo, getComponentInfo().getFacet("header"));
-        
-        final List facetDecorators = getComponentInfo().getDecorators(
-                ComponentFactory.FACET);
-        boolean hasFacet = false;
-        for (final Iterator it = facetDecorators.iterator(); it.hasNext();) {
-            final FacetDecorator decorator = (FacetDecorator) it.next();
-
-            if ("header".equals(decorator.getName())) {
-                RuntimeTestUtil.verifySame(componentInfo, decorator
-                        .getDecorates());
-                hasFacet = true;
-                break;
-            }
-        }
-        assertTrue(hasFacet);
-
-        final List useGetFacets = getComponentInfo().getFacets();
-        assertEquals(facetDecorators, useGetFacets);
-    }
-
-    public void testGetParent() {
-        final ComponentInfo componentInfo = ComponentFactory
-                .createComponentInfo("id2", getComponentInfo(),
-                        _componentTypeInfo, true);
-        assertEquals(getComponentInfo(), componentInfo.getParent());
-    }
-
-    @Override
-    public void testSerializable() throws Exception {
-        final ComponentInfo child = ComponentFactory.createComponentInfo("id2",
-                getComponentInfo(), _componentTypeInfo, true);
-        getComponentInfo().addChild(child);
-
-        final ComponentInfo facet = ComponentFactory.createComponentInfo("id3",
-                getComponentInfo(), _componentTypeInfo, true);
-        getComponentInfo().addFacet("header", facet);
-
-        final ComponentInfo deserialized = RuntimeTestUtil
-                .serializeDeserialize(getComponentInfo());
-
-        RuntimeTestUtil.verifySame(getComponentInfo(), deserialized);
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestComponentTypeInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestComponentTypeInfo.java
deleted file mode 100644
index 9495e04..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestComponentTypeInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-
-import junit.framework.TestCase;
-
-public class TestComponentTypeInfo extends TestCase {
-
-    private ComponentTypeInfo _componentTypeInfo;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        _componentTypeInfo = new ComponentTypeInfo("blah", "Blah", "Blah", "renderBlah");
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testToString()
-    {
-        // for now, just test toString to get coverage.  We get enough
-        // coverage from the component test classes currently.
-        // later we will need to look for more coverage in this classe
-        System.out.println(_componentTypeInfo.toString());
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUICommandInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUICommandInfo.java
deleted file mode 100644
index b801cee..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUICommandInfo.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.ActionSourceInfo2;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UICommandInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestUICommandInfo extends TestComponentInfo {
-    private ActionListenerDecorator _actionListener;
-    private ActionSourceInfo2 _actionSourceInfo;
-    private ActionSourceInfo2 _actionSourceInfo2;
-    private UICommandInfo _uiCommand1;
-    private UICommandInfo _uiCommand_NoActionSourceAtConstruction;
-    private UICommandInfo _uiCommandActionListenerAtConstruction;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _actionSourceInfo = new ActionSourceInfo2("bean.Action",
-                "com.ActionListener", true, "bean.Action");
-        _uiCommand1 = ComponentFactory.createUICommandInfo("id", null,
-                _componentTypeInfo, _actionSourceInfo, true);
-
-        _uiCommand_NoActionSourceAtConstruction = ComponentFactory
-                .createUICommandInfo("id2", null, _componentTypeInfo, null,
-                        false);
-
-        _actionSourceInfo2 = new ActionSourceInfo2("bean.Action",
-                "com.ActionListener", false, "bean.Action");
-        _actionListener = new ActionListenerDecorator(null);
-        _actionSourceInfo2.addActionListener(_actionListener);
-        _uiCommandActionListenerAtConstruction = ComponentFactory
-                .createUICommandInfo("id3", null, _componentTypeInfo,
-                        _actionSourceInfo2, true);
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testGetActionExpression() {
-        assertEquals("bean.Action", _uiCommand1.getActionExpression());
-        assertNull(_uiCommand_NoActionSourceAtConstruction
-                .getActionExpression());
-    }
-
-    public void testGetAction() {
-        assertEquals("bean.Action", _uiCommand1.getAction());
-        assertNull(_uiCommand_NoActionSourceAtConstruction.getAction());
-    }
-
-    public void testGetActionListener() {
-        assertEquals("com.ActionListener", _uiCommand1.getActionListener());
-        assertNull(_uiCommand_NoActionSourceAtConstruction.getActionListener());
-    }
-
-    public void testImplicitAdapter() {
-        RuntimeTestUtil.verifyImplicitAdapter(getComponentInfo(),
-                ComponentFactory.ACTION_SOURCE, _actionSourceInfo);
-        RuntimeTestUtil.verifyImplicitAdapter(getComponentInfo(),
-                ComponentFactory.ACTION_SOURCE2, _actionSourceInfo);
-    }
-
-    public void testGetActionListeners() {
-        assertTrue(_uiCommandActionListenerAtConstruction.getActionListeners()
-                .contains(_actionListener));
-        assertTrue(_uiCommandActionListenerAtConstruction.getDecorators(
-                ComponentFactory.ACTION_LISTENER).contains(
-                        _actionListener));
-
-        final ActionListenerDecorator actionListener = 
-            new ActionListenerDecorator(_uiCommand1);
-        _uiCommand1.addActionListener(actionListener);
-
-        assertEquals(1, _uiCommand1.getActionListeners().size());
-        assertTrue(_uiCommand1.getActionListeners().contains(
-                actionListener));
-        assertTrue(_uiCommand1.getDecorators(
-                ComponentFactory.ACTION_LISTENER).contains(
-                actionListener));
-    }
-
-    public void testIsImmediate() {
-        assertTrue(_uiCommand1.isImmediate());
-    }
-
-    @Override
-    public void testSerializable() throws Exception {
-        UICommandInfo commandInfo = RuntimeTestUtil
-                .serializeDeserialize(_uiCommand1);
-        RuntimeTestUtil.verifySame(_uiCommand1, commandInfo);
-    }
-
-    @Override
-    protected ComponentInfo getComponentInfo() {
-        return _uiCommand1;
-    }
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIDataInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIDataInfo.java
deleted file mode 100644
index e6ffc88..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIDataInfo.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.DataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIDataInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestUIDataInfo extends TestComponentInfo {
-
-    private UIDataInfo _uiData;
-    private UIDataInfo _uiDataWithFacetsAtConstruction;
-    private DataModelInfo _dataModel;
-    private Object _rowData;
-    private Object _value;
-    private ComponentInfo _header;
-    private ComponentInfo _footer;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _dataModel = new DataModelInfo(true, -1, null, 1, null);
-        _rowData = new Object();
-        _value = new Object();
-
-        _uiData = ComponentFactory.createUIDataInfo("id", null,
-                _componentTypeInfo, true, _dataModel, 0, null, null, 1, true,
-                _rowData, 2, 3, _value, "row");
-
-        _header = ComponentFactory.createComponentInfo("header", null,
-                _componentTypeInfo, true);
-        _footer = ComponentFactory.createComponentInfo("footer", null,
-                _componentTypeInfo, true);
-        _uiDataWithFacetsAtConstruction = ComponentFactory.createUIDataInfo(
-                "id3", null, _componentTypeInfo, true, _dataModel, 3, _footer,
-                _header, 2, true, _rowData, 1, 0, _value, "row");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testFacets()
-    {
-        // nothing set on construction
-        assertNull(_uiData.getFooter());
-        assertNull(_uiData.getFacet(UIDataInfo.FACET_NAME_FOOTER));
-        assertNull(_uiData.getHeader());
-        assertNull(_uiData.getFacet(UIDataInfo.FACET_NAME_HEADER));
-        _uiData.addFacet(UIDataInfo.FACET_NAME_FOOTER,  _footer);
-        _uiData.addFacet(UIDataInfo.FACET_NAME_HEADER,  _header);
-        
-        assertEquals(_footer, _uiData.getFooter());
-        assertEquals(_header, _uiData.getHeader());
-        
-        // set on construction
-        assertEquals(_footer, _uiDataWithFacetsAtConstruction.getFooter());
-        assertEquals(_header, _uiDataWithFacetsAtConstruction.getHeader());
-    }
-    
-    public void testGetDataModel() {
-        RuntimeTestUtil.verifySame(_dataModel, _uiData.getDataModel());
-    }
-
-    public void testGetFirst() {
-        assertEquals(0, _uiData.getFirst());
-    }
-
-    public void testGetRowCount() {
-        assertEquals(1, _uiData.getRowCount());
-    }
-
-    public void testIsRowAvailable() {
-        assertTrue(_uiData.isRowAvailable());
-    }
-
-    public void testGetRowData() {
-        assertEquals(_rowData, _uiData.getRowData());
-    }
-
-    public void testGetRowIndex() {
-        assertEquals(2, _uiData.getRowIndex());
-    }
-
-    public void testGetRows() {
-        assertEquals(3, _uiData.getRows());
-    }
-
-    public void testGetValue() {
-        assertEquals(_value, _uiData.getValue());
-    }
-
-    public void testGetVar() {
-        assertEquals("row", _uiData.getVar());
-    }
-
-    public void testImplicitAdapter() {
-        RuntimeTestUtil.verifyImplicitAdapter(getComponentInfo(),
-                ComponentFactory.NAMING_CONTAINER, new INamingContainerInfo() {
-
-                    /**
-                     * 
-                     */
-                    private static final long serialVersionUID = -4727106447103788829L;
-                });
-    }
-
-    @Override
-    public ComponentInfo getComponentInfo() {
-        return _uiData;
-    }
-
-    @Override
-    public void testSerializable() throws Exception {
-        final UIDataInfo deserialized = RuntimeTestUtil
-                .serializeDeserialize(_uiData);
-
-        RuntimeTestUtil.verifySame(_uiData, deserialized);
-
-        // the Objects may not be serializable
-
-        // if the object is not serializable, then the deserialize will be null
-        if (_uiData.getRowData() instanceof Serializable) {
-            assertEquals(_uiData.getRowData(), deserialized.getRowData());
-        } else {
-            assertNull(deserialized.getRowData());
-        }
-
-        // if the object is not serializable, then the deserialize will be null
-        if (_uiData.getValue() instanceof Serializable) {
-            assertEquals(_uiData.getValue(), deserialized.getValue());
-        } else {
-            assertNull(deserialized.getValue());
-        }
-    }
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIFormInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIFormInfo.java
deleted file mode 100644
index 6315267..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIFormInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIFormInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestUIFormInfo extends TestComponentInfo {
-
-    private UIFormInfo _uiForm1;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        _uiForm1 = ComponentFactory.createUIFormInfo
-            ("id", null, _componentTypeInfo, true, true, true);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testIsPrependId() {
-        assertTrue(_uiForm1.isPrependId());
-    }
-
-    public void testIsSubmitted() {
-        assertTrue(_uiForm1.isSubmitted());
-    }
-
-    @Override
-    protected ComponentInfo getComponentInfo() {
-        return _uiForm1;
-    }
-
-    public void testImplicitAdapter() {
-        RuntimeTestUtil.verifyImplicitAdapter(getComponentInfo(),
-                ComponentFactory.NAMING_CONTAINER, new INamingContainerInfo() {
-
-                    /**
-                     * 
-                     */
-                    private static final long serialVersionUID = -3927882952151032590L;});
-    }
-
-    @Override
-    public void testSerializable() throws Exception {
-        final UIFormInfo uiForm = RuntimeTestUtil.serializeDeserialize(_uiForm1);
-        RuntimeTestUtil.verifySame(_uiForm1, uiForm);
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIInputInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIInputInfo.java
deleted file mode 100644
index fda91ff..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIInputInfo.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.EditableValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIInputInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValueChangeListenerDecorator;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestUIInputInfo extends TestUIOutputInfo {
-
-    private UIInputInfo _uiComponentInfo1;
-    private UIInputInfo _uiComponentInfo_NoValueHolderAtConstruction;
-    private UIInputInfo _uiInput_ValidatorAndListenerAtConstruction;
-    private EditableValueHolderInfo _editableValueHolder;
-    private EditableValueHolderInfo _editableValueHolder2;
-    private ValidatorDecorator _validator;
-    private ValueChangeListenerDecorator _valueChangeListener;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _uiComponentInfo_NoValueHolderAtConstruction = ComponentFactory
-                .createUIInputInfo("idNoConstruction", null,
-                        _componentTypeInfo, null, true);
-
-        _editableValueHolder = new EditableValueHolderInfo(null, "value",
-                "value", true, true, false, true, null, null, null);
-
-        _uiComponentInfo1 = ComponentFactory.createUIInputInfo("id", null,
-                _componentTypeInfo, _editableValueHolder, true);
-
-        _editableValueHolder2 = new EditableValueHolderInfo(null, "value2",
-                "value2", true, true, false, true, null, null, null);
-        _validator = new ValidatorDecorator(null, ValidatorTypeInfo.UNKNOWN);
-        _editableValueHolder2.addValidator(_validator);
-        _valueChangeListener = new ValueChangeListenerDecorator(null);
-        _editableValueHolder2.addValueChangeListener(_valueChangeListener);
-        _uiInput_ValidatorAndListenerAtConstruction = ComponentFactory
-                .createUIInputInfo("id", null, _componentTypeInfo,
-                        _editableValueHolder2, true);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testIsValid() {
-        assertFalse(_uiComponentInfo1.isValid());
-        assertTrue(_uiComponentInfo_NoValueHolderAtConstruction.isValid());
-    }
-
-    public void testIsImmediate() {
-        assertTrue(_uiComponentInfo1.isImmediate());
-        assertFalse(_uiComponentInfo_NoValueHolderAtConstruction.isImmediate());
-    }
-
-    public void testIsRequired() {
-        assertTrue(_uiComponentInfo1.isRequired());
-        assertFalse(_uiComponentInfo_NoValueHolderAtConstruction.isRequired());
-    }
-
-    public void testIsLocalValueSet() {
-        assertTrue(_uiComponentInfo1.isLocalSetValue());
-        assertFalse(_uiComponentInfo_NoValueHolderAtConstruction
-                .isLocalSetValue());
-    }
-
-    public void testValidators() {
-        assertTrue(_uiInput_ValidatorAndListenerAtConstruction.getValidators()
-                .contains(_validator));
-        assertTrue(_uiInput_ValidatorAndListenerAtConstruction.getDecorators(
-                ComponentFactory.VALIDATOR).contains(_validator));
-
-        final ValidatorDecorator validator = new ValidatorDecorator(
-                _uiComponentInfo1,ValidatorTypeInfo.UNKNOWN);
-        _uiComponentInfo1.addValidator(validator);
-
-        assertEquals(1, _uiComponentInfo1.getValidators().size());
-        assertTrue(_uiComponentInfo1.getValidators().contains(validator));
-        assertTrue(_uiComponentInfo1.getDecorators(ComponentFactory.VALIDATOR)
-                .contains(validator));
-    }
-
-    public void testValueChangeListener() {
-        assertTrue(_uiInput_ValidatorAndListenerAtConstruction
-                .getValueChangeListeners().contains(_valueChangeListener));
-        assertTrue(_uiInput_ValidatorAndListenerAtConstruction.getDecorators(
-                ComponentFactory.VALUE_CHANGE_LISTENER).contains(
-                _valueChangeListener));
-
-        final ValueChangeListenerDecorator valueChangeListener = new ValueChangeListenerDecorator(
-                _uiComponentInfo1);
-        _uiComponentInfo1.addValueChangeListener(valueChangeListener);
-
-        assertEquals(1, _uiComponentInfo1.getValueChangeListeners().size());
-        assertTrue(_uiComponentInfo1.getValueChangeListeners().contains(
-                valueChangeListener));
-        assertTrue(_uiComponentInfo1.getDecorators(
-                ComponentFactory.VALUE_CHANGE_LISTENER).contains(
-                valueChangeListener));
-
-    }
-
-    @Override
-    protected ComponentInfo getComponentInfo() {
-        return _uiComponentInfo1;
-    }
-
-    @Override
-    public void testImplicitAdapter() {
-        super.testImplicitAdapter();
-        RuntimeTestUtil.verifyImplicitAdapter(_uiComponentInfo1,
-                ComponentFactory.EDITABLE_VALUE_HOLDER, _editableValueHolder);
-    }
-
-    @Override
-    public void testSerializable() throws Exception {
-        final UIInputInfo deserialized = RuntimeTestUtil
-                .serializeDeserialize(_uiComponentInfo1);
-
-        RuntimeTestUtil.verifySame(_uiComponentInfo1, deserialized);
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIOutputInfo.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIOutputInfo.java
deleted file mode 100644
index 21feb08..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/component/TestUIOutputInfo.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.component;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.ValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIOutputInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestUIOutputInfo extends TestComponentInfo {
-    private UIOutputInfo _uiOutputInfo;
-    private UIOutputInfo _uiOutputInfo2;
-    private ValueHolderInfo _valueHolder;
-    private ValueHolderInfo _valueHolder2;
-    private ConverterDecorator _converter;
-    private ConverterTypeInfo  _converterTypeInfo;
-    private UIOutputInfo _uiOutputInfo_NoValueHolderAtConstruction;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _valueHolder = new ValueHolderInfo(null, "value", "value");
-        _uiOutputInfo = ComponentFactory.createUIOutputInfo("id", null,
-                _componentTypeInfo, _valueHolder, true);
-
-        _converterTypeInfo = ConverterTypeInfo.UNKNOWN; 
-        _converter = new ConverterDecorator(null, _converterTypeInfo);
-        _valueHolder2 = new ValueHolderInfo(_converter, "value2", "value2");
-        _uiOutputInfo2 = ComponentFactory.createUIOutputInfo("id2", null,
-                _componentTypeInfo, _valueHolder2, true);
-
-        _uiOutputInfo_NoValueHolderAtConstruction = ComponentFactory
-                .createUIOutputInfo("id", null, _componentTypeInfo, null, true);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testGetConverter() {
-        // not converter by setup
-        assertNull(_uiOutputInfo.getConverter());
-        assertTrue(_uiOutputInfo.getDecorators(ComponentFactory.CONVERTER)
-                .isEmpty());
-
-        // this one has a converter by construction
-        assertEquals(_converter, _uiOutputInfo2.getConverter());
-        assertEquals(_converter, _uiOutputInfo2.getDecorators(
-                ComponentFactory.CONVERTER).get(0));
-        assertEquals(_converterTypeInfo, ((ConverterDecorator)_uiOutputInfo2.getDecorators(
-                ComponentFactory.CONVERTER).get(0)).getTypeInfo());
-    }
-
-    public void testGetLocalValue() {
-        assertEquals("value", _uiOutputInfo.getLocalValue());
-        assertEquals("value2", _uiOutputInfo2.getLocalValue());
-        assertNull(_uiOutputInfo_NoValueHolderAtConstruction.getLocalValue());
-    }
-
-    public void testGetValue() {
-        assertEquals("value", _uiOutputInfo.getValue());
-        assertEquals("value2", _uiOutputInfo2.getValue());
-        assertNull(_uiOutputInfo_NoValueHolderAtConstruction.getValue());
-    }
-
-    public void testImplicitAdapter() {
-        RuntimeTestUtil.verifyImplicitAdapter(getComponentInfo(),
-                ComponentFactory.VALUE_HOLDER, _valueHolder);
-    }
-
-    @Override
-    public void testSerializable() throws Exception {
-        final UIOutputInfo deserialized = RuntimeTestUtil
-                .serializeDeserialize(_uiOutputInfo);
-
-        RuntimeTestUtil.verifySame(_uiOutputInfo, deserialized);
-
-        final UIOutputInfo deserialized2 = RuntimeTestUtil
-                .serializeDeserialize(_uiOutputInfo2);
-        RuntimeTestUtil.verifySame(_uiOutputInfo2, deserialized2);
-    }
-
-    @Override
-    protected ComponentInfo getComponentInfo() {
-        return _uiOutputInfo;
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/decorator/TestComponentDecorator.java b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/decorator/TestComponentDecorator.java
deleted file mode 100644
index 0687525..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/src/org/eclipse/jst/jsf/common/runtime/tests/model/decorator/TestComponentDecorator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.tests.model.decorator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ComponentDecorator;
-import org.eclipse.jst.jsf.common.runtime.tests.model.RuntimeTestUtil;
-
-public class TestComponentDecorator extends TestCase {
-
-    private ComponentTypeInfo _componentTypeInfo;
-    private ComponentInfo _decorates;
-    private ComponentDecorator _componentDecorator;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        _componentTypeInfo = new ComponentTypeInfo("org.eclipse.jst.jsf.test",
-                "org.eclipse.jst.jsf.test.ComponentClass",
-                "org.eclipse.jst.jsf.test.ComponentFamily",
-                "org.eclipse.jst.jsf.test.RenderFamily");
-
-        _decorates = ComponentFactory.createComponentInfo("id", null,
-                _componentTypeInfo, true);
-
-        _componentDecorator = new MockComponentDecorator(_decorates);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testGetDecorates() {
-        assertEquals(_decorates, _componentDecorator.getDecorates());
-    }
-
-    public void testSerializable() throws Exception {
-        final ComponentDecorator deserialized = RuntimeTestUtil
-                .serializeDeserialize(_componentDecorator);
-
-        RuntimeTestUtil.verifySame(_componentDecorator, deserialized);
-    }
-
-    public static class MockComponentDecorator extends ComponentDecorator {
-        /**
-         * serialization id
-         */
-        private static final long serialVersionUID = 7317971755600134713L;
-
-        public MockComponentDecorator(final ComponentInfo decorates) {
-            super(decorates);
-        }
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.classpath b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.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.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.cvsignore b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.cvsignore
deleted file mode 100644
index 5e903f8..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-temp.folder
-build.xml
-javaCompiler.jsfcontentassisttests.jar.args
-
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.project b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.project
deleted file mode 100644
index 2e0c667..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsf.contentassist.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/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.settings/org.eclipse.core.resources.prefs b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 0a53ff7..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:01:19 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.settings/org.eclipse.jdt.core.prefs b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 467e199..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,61 +0,0 @@
-#Wed Sep 19 11:05:10 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-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=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 347b702..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsf.contentassist.tests
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.contentassist.tests.ContentAssistTestsPlugin
-Bundle-Localization: plugin
-Bundle-ClassPath: jsfcontentassisttests.jar
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="[3.8.1,4.0.0)",
- org.eclipse.jst.jsf.test.util;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.jsf.core.tests;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.jsf.contentassist.tests;x-internal:=true
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/about.html b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/about.html
deleted file mode 100644
index 04d4782..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
- 
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/build.properties b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/build.properties
deleted file mode 100644
index 6afa53a..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Oracle - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               jsfcontentassisttests.jar,\
-               test.xml,\
-               about.html,\
-               testdata/,\
-               plugin.properties
-source.jsfcontentassisttests.jar = src/
-output.jsfcontentassisttests.jar = bin/
-jars.compile.order = jsfcontentassisttests.jar
-javacSource=1.5
-javacTarget=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/plugin.properties
deleted file mode 100644
index ceb11e8..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=JavaServer Faces Tools - Contentassist Tests Plug-in
-Bundle-Vendor.0=Eclipse.org
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/AllTests.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/AllTests.java
deleted file mode 100644
index 6bd7405..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/AllTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * All tests suite for content assist
- *
- * @author cbateman
- *
- */
-public class AllTests {
-    /**
-     * @return the test suite
-     */
-    public static Test suite()
-    {
-        final TestSuite suite = new TestSuite("Test for org.eclipse.jst.jsf.contentassist");
-        //$JUnit-BEGIN$
-        suite.addTestSuite(CompletionPrefixTest.class);
-        suite.addTestSuite(Test_bug_149224.class);
-        suite.addTestSuite(Test_bug_149743.class);
-        suite.addTestSuite(TestIdCompletionStrategy.class);
-        suite.addTestSuite(TestFunctionCompletionStrategy.class);
-        suite.addTestSuite(TestContentAssistParser.class);
-        //$JUnit-END$
-        return suite;
-    }
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/BaseTestClass.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/BaseTestClass.java
deleted file mode 100644
index a9b1814..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/BaseTestClass.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver;
-import org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistParser;
-import org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistStrategy;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper.ContextWrapper;
-import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts;
-
-public class BaseTestClass extends TestCase {
-
-
-
-
-	/**
-	 * Uses the docOffset to find the EL text used to generate the proposals on.
-	 * @param jspFile
-	 * @param docOffset
-	 * @param exprOffset
-	 * @return the proposals
-	 * @throws Exception
-	 */
-	protected final List<ICompletionProposal> getProposals(final IFile jspFile,
-			final int docOffset, final int exprOffset) throws Exception {
-		ContextWrapper wrapper = null;
-
-		try {
-			wrapper = JSFCoreUtilHelper.getDocumentContext(jspFile, docOffset);
-
-			final ITextRegionContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
-					.getTextRegionResolver(wrapper.getContext());
-
-			assertEquals(DOMJSPRegionContexts.JSP_VBL_CONTENT, resolver.getRegionType());
-			final String elText = resolver.getRegionText().trim();
-			assertNotNull(elText);
-
-			final ContentAssistStrategy strategy = ContentAssistParser
-					.getPrefix(exprOffset, elText);
-			assertNotNull(strategy);
-			return strategy.getProposals(wrapper.getContext());
-		} finally {
-			if (wrapper != null) {
-				wrapper.dispose();
-			}
-		}
-	}
-
-	/**
-	 * This method doesn't use the docOffset to find the EL text.
-	 *
-	 * @param jspFile
-	 * @param exprOffset
-	 * @param elText
-	 * @return the proposals at 1-based exprOffset into elText
-	 * @throws Exception
-	 */
-	protected final List<ICompletionProposal> getProposals(final IFile jspFile,
-			final int docOffset, final String elText, final int exprOffset) throws Exception
-	{
-		ContextWrapper wrapper = null;
-
-		try {
-			wrapper = JSFCoreUtilHelper.getDocumentContext(jspFile, docOffset);
-
-
-			final ContentAssistStrategy strategy = ContentAssistParser
-					.getPrefix(exprOffset, elText);
-			assertNotNull(strategy);
-			return strategy.getProposals(wrapper.getContext());
-		} finally {
-			if (wrapper != null) {
-				wrapper.dispose();
-			}
-		}
-
-	}
-
-    protected final void applyAndCheck(final IFile jspFile, final int offset, final ICompletionProposal applyMe, final String expectedResult)
-			throws Exception {
-		ContextWrapper wrapper = null;
-
-		try {
-			wrapper = JSFCoreUtilHelper.getDocumentContext(jspFile, offset);
-
-			applyMe.apply(JSFCoreUtilHelper.getDocumentContext(jspFile, offset).getContext()
-					.getStructuredDocument());
-
-			final ITextRegionContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
-					.getTextRegionResolver(wrapper.getContext());
-
-			final String newELText = resolver.getRegionText();
-			assertEquals(expectedResult, newELText);
-		} finally {
-			if (wrapper != null) {
-				wrapper.dispose();
-			}
-		}
-	}
-
-	/**
-	 * @param expected
-	 * @param proposals
-	 */
-	protected void assertDisplayNamesMatch(final Set<String> expected, final List<ICompletionProposal>  proposals) {
-		assertEquals(expected.size(), proposals.size());
-
-		for (final ICompletionProposal proposal : proposals)
-		{
-			expected.contains(proposal.getDisplayString());
-		}
-	}
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/CompletionPrefixTest.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/CompletionPrefixTest.java
deleted file mode 100644
index f596e82..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/CompletionPrefixTest.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistParser;
-import org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistStrategy;
-
-/**
- * @author cbateman
- *
- */
-public class CompletionPrefixTest extends TestCase
-{
-    /* empty expresion */
-    private final static String empty_ = " ";
-
-    /* simple value expressions */
-    private final static String xxx = "xxx";
-    private final static String xxxDot = "xxx.";
-    private final static String xxxYYY = "xxx.yyy";
-    private final static String xxxYYYZZZ = "xxx.yyy.zzz";
-
-    /* value expressions with comparisons */
-    private final static String xxxLtYYY = "xxx < yyy";
-    private final static String xxxDotYYYLtZZZ = "xxx.yyy < zzz";
-
-    /* expressions using the ['yyy'] map syntax */
-    private final static String xxxMapYYY = "xxx['yyy']";
-    private final static String xxxMapXXXExpr = "xxx[XXX]";
-    private final static String xxxMapXXXDotExpr = "xxx[XXX.]";
-    private final static String xxxMapXXXDotYYYExpr = "xxx[XXX.YYY]";
-    private final static String xxxMapXXXDotYYYDotExpr = "xxx[XXX.YYY.]";
-    private final static String xxxMapXXXDotYYYDotZZZExpr = "xxx[XXX.YYY.ZZZ]";
-
-
-
-    /**
-     * Test passing null to the parser
-     */
-    public void testPrefix_null()
-    {
-        /* Test passing a null expression */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, null);
-            assertNull(prefix);
-        }
-    }
-
-    /**
-     *
-     */
-    public void testPrefix_empty_()
-    {
-        /* Test   */
-        /*      ^        */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, empty_);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testPrefix_xxx()
-    {
-        /* Test  x x x */
-        /*      ^        */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, xxx);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x */
-        /*        ^                    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(2, xxx);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x */
-        /*            ^                */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(4, xxx);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testPrefix_xxxDot()
-    {
-        /* Test  x x x . */
-        /*      ^        */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, xxxDot);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . */
-        /*        ^                    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(2, xxxDot);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x .  */
-        /*            ^                */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(4, xxxDot);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testSuffix_xxxDot()
-    {
-        /* Test  x x x . */
-        /*              ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(5, xxxDot);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testPrefix_xxxYYY()
-    {
-        /* Test  x x x . y y y . z z z */
-        /*      ^                      */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, xxxYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*        ^                    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(2, xxxYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*            ^                */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(4, xxxYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testFirstSuffix_xxxYYY()
-    {
-        /* Test  x x x . y y y . z z z */
-        /*              ^              */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(5, xxxYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*                ^            */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(6, xxxYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*                    ^        */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(8, xxxYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     * Test code completion on an EL prefix expression such as prefix.suffix
-     */
-    public void testPrefix_xxxYYYZZZ()
-    {
-        /* Test  x x x . y y y . z z z */
-        /*      ^                      */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*        ^                    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(2, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*            ^                */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(4, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-    }
-
-
-    /**
-     *
-     */
-    public void testFirstSuffix_xxxYYYZZZ()
-    {
-        /* Test  x x x . y y y . z z z */
-        /*              ^              */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(5, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*                ^            */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(6, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*                    ^        */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(8, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-    }
-
-
-    /**
-     *
-     */
-    public void testSecondSuffix_xxxYYYZZZ()
-    {
-        /* Test  x x x . y y y . z z z */
-        /*                      ^      */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(9, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx.yyy".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*                        ^    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(10, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx.yyy".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y . z z z */
-        /*                            ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(12, xxxYYYZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx.yyy".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testPrefix_xxxLtYYY()
-    {
-        /* Test  x x x  < y y y */
-        /*      ^               */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, xxxLtYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x  < y y y */
-        /*        ^             */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(2, xxxLtYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x  < y y y */
-        /*            ^         */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(4, xxxLtYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x  < y y y */
-        /*               ^      */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(7, xxxLtYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "yyy".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x  < y y y */
-        /*                 ^    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(8, xxxLtYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "yyy".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x  < y y y */
-        /*                 ^    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(10, xxxLtYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "yyy".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testPrefix_xxxDotYYYLtZZZ()
-    {
-        /* Test  x x x . y y y < z z z */
-        /*      ^                      */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y < z z z */
-        /*        ^                    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(2, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y < z z z */
-        /*            ^                */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(4, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y < z z z */
-        /*              ^              */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(5, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y < z z z */
-        /*                ^            */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(6, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y < z z z */
-        /*                    ^        */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(8, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y < z z z */
-        /*                      ^      */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(11, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "zzz".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x . y y y < z z z */
-        /*                            ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(14, xxxDotYYYLtZZZ);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                            && "zzz".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testSuffix_xxxDotYYYLtZZZ()
-    {
-        /* Test  x x x . y y y < z z z . */
-        /*                              ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(15, xxxDotYYYLtZZZ+".");
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                            && "zzz".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     *
-     */
-    public void testPrefix_xxxMapYYY()
-    {
-        /* Test  x x x [ ' y y y ' ] */
-        /*      ^                    */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(1, xxxMapYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x [ ' y y y ' ] */
-        /*        ^                  */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(2, xxxMapYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test  x x x [ ' y y y ' ] */
-        /*            ^              */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(4, xxxMapYYY);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "xxx".equals(prefix.getValue()));
-        }
-
-        /* Test x x x [ ' y y y ' ]  */
-        /*                         ^ */
-//        {
-//            ContentAssistStrategy prefix = ContentAssistParser.getPrefix(11, xxxMapYYY);
-//
-//            System.out.println(prefix.getValue());
-//            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-//                    && "xxx['yyy']".equals(prefix.getValue()));
-//        }
-
-        /* Test x x x [ ' y y y ' ] .  */
-        /*                           ^ */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(12, xxxMapYYY+".");
-
-            System.out.println(prefix.getValue());
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION
-                    && "xxx['yyy']".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     * Test completion inside an array
-     */
-    public void testPrefix_xxxMapXXXDotExpr()
-    {
-        /* Test x x x [ X X X ] */
-        /*             ^ */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(5, xxxMapXXXExpr);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "XXX".equals(prefix.getValue()));
-        }
-
-        /* Test x x x [ X X X ] */
-        /*               ^ */
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(6, xxxMapXXXExpr);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "XXX".equals(prefix.getValue()));
-        }
-
-        /* Test x x x [ X X X ] */
-        /*                   ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(8, xxxMapXXXExpr);
-
-            assertTrue(prefix.getType() == ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION
-                    && "XXX".equals(prefix.getValue()));
-        }
-    }
-
-    /**
-     * Tests suffix completions on dots inside brackets
-     */
-    public void testSuffix_xxxMapXXXDotExpr()
-    {
-        /* Test x x x [ X X X . ] */
-        /*                   ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(8, xxxMapXXXDotExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_ID_COMPLETION, prefix.getType());
-            assertEquals("XXX", prefix.getValue());
-        }
-
-        /* Test x x x [ X X X . ] */
-        /*                     ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(9, xxxMapXXXDotExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX", prefix.getValue());
-        }
-    }
-
-    /**
-     * Test dot completion inside an array expression
-     */
-    public void testSuffix_xxxMapXXXDotYYYExpr()
-    {
-        /* Test x x x [ X X X . Y Y Y ] */
-        /*                     ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(9, xxxMapXXXDotYYYExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX", prefix.getValue());
-        }
-
-        /* Test x x x [ X X X . Y Y Y ] */
-        /*                       ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(10, xxxMapXXXDotYYYExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX", prefix.getValue());
-        }
-
-        /* Test x x x [ X X X . Y Y Y ] */
-        /*                           ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(12, xxxMapXXXDotYYYExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX", prefix.getValue());
-        }
-
-        /* Test x x x [ X X X . Y Y Y . ] */
-        /*                           ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(12, xxxMapXXXDotYYYDotExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX", prefix.getValue());
-        }
-
-        /* Test x x x [ X X X . Y Y Y . ] */
-        /*                             ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(13, xxxMapXXXDotYYYDotExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX.YYY", prefix.getValue());
-        }
-    }
-
-    /**
-     * Test dot completion on XXX.YYY.ZZZ type expressions
-     */
-    public void testSuffix_xxxMapXXXDotYYYDotZZZExpr()
-    {
-        /* Test x x x [ X X X . Y Y Y . Z Z Z] */
-        /*                             ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(13, xxxMapXXXDotYYYDotZZZExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX.YYY", prefix.getValue());
-        }
-
-        /* Test x x x [ X X X . Y Y Y . Z Z Z] */
-        /*                               ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(14, xxxMapXXXDotYYYDotZZZExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX.YYY", prefix.getValue());
-        }
-
-        /* Test x x x [ X X X . Y Y Y . Z Z Z ] */
-        /*                                   ^*/
-        {
-            final ContentAssistStrategy prefix = ContentAssistParser.getPrefix(16, xxxMapXXXDotYYYDotZZZExpr);
-
-            assertEquals(ContentAssistStrategy.PREFIX_TYPE_DOT_COMPLETION, prefix.getType());
-            assertEquals("XXX.YYY", prefix.getValue());
-        }
-
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/ContentAssistTestsPlugin.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/ContentAssistTestsPlugin.java
deleted file mode 100644
index 4bda030..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/ContentAssistTestsPlugin.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ContentAssistTestsPlugin extends AbstractUIPlugin {
-
-	/**
-	 * The plug-in ID
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.jst.jsf.contentassist.tests";
-
-	// The shared instance
-	private static ContentAssistTestsPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public ContentAssistTestsPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(final BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(final BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static ContentAssistTestsPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestContentAssistParser.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestContentAssistParser.java
deleted file mode 100644
index a7d941c..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestContentAssistParser.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-import org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistParser;
-import org.eclipse.jst.jsf.core.internal.contentassist.el.SymbolInfo;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper;
-import org.eclipse.jst.jsf.core.tests.util.JSFFacetedTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JDTTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JSFTestUtil;
-import org.eclipse.jst.jsf.test.util.TestFileResource;
-import org.eclipse.jst.jsf.test.util.WebProjectTestEnvironment;
-
-public class TestContentAssistParser extends BaseTestClass
-{
-	private WebProjectTestEnvironment _testEnv;
-	private IFile _jspFile;
-	private IType _myBeanType;
-
-	@Override
-	protected void setUp() throws Exception
-	{
-        super.setUp();
-
-        JSFTestUtil.setValidationEnabled(false);
-
-        _testEnv = new WebProjectTestEnvironment(getClass().getName()+"_"+getName());
-        _testEnv.createProject(false);
-        assertNotNull(_testEnv);
-        assertNotNull(_testEnv.getTestProject());
-        assertTrue(_testEnv.getTestProject().isAccessible());
-
-        final JSFFacetedTestEnvironment jsfFacedEnv = new JSFFacetedTestEnvironment(_testEnv);
-        jsfFacedEnv.initialize(IJSFCoreConstants.FACET_VERSION_1_1);
-
-        _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/faces-config_basic.xml.data",
-                                      "/WEB-INF/faces-config.xml");
-        _jspFile = (IFile) _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/basicELExpressions.jsp.data",
-                                      "/basicELExpressions.jsp");
-        assertNotNull(_jspFile);
-        assertTrue(_jspFile.isAccessible());
-
-        final JDTTestEnvironment jdtTestEnv = new JDTTestEnvironment(_testEnv);
-        final TestFileResource resource = new TestFileResource();
-        resource.load(ContentAssistTestsPlugin.getDefault().getBundle(),
-                      "/testdata/MyBean.java.data");
-        jdtTestEnv.addSourceFile("src", "beans", "MyBean", resource.toString());
-        _myBeanType = JavaCore.create(_testEnv.getTestProject()).findType("beans.MyBean");
-        assertNotNull(_myBeanType);
-        assertTrue(_myBeanType.exists());
-    }
-
-	public void testSanity() throws Exception
-	{
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 518, "value", "#{}");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 547, "value", "#{   }");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 579, "value", "#{myBean}");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 614, "value", "#{myBean.property}");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 658, "value", "#{paramValues.foo}");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 706, "action", "#{myBean.actionMethod}");
-
-		JSFCoreUtilHelper.assertELVariableSanity(_jspFile, "myBean");
-	}
-
-
-	public void testGetPrefix() {
-		// for now there's a enough coverage through TestIdCompletionStrategy
-	}
-
-	public void testGetSymbolInfo() throws Exception
-	{
-		assertNull(ContentAssistParser.getSymbolInfo(JSFCoreUtilHelper.getDocumentContext(_jspFile, 518).getContext(), 1, null));
-		assertNull(ContentAssistParser.getSymbolInfo(JSFCoreUtilHelper.getDocumentContext(_jspFile, 518).getContext(), 1, ""));
-		assertNull(ContentAssistParser.getSymbolInfo(JSFCoreUtilHelper.getDocumentContext(_jspFile, 547).getContext(), 1, "   "));
-
-		// variable test
-		SymbolInfo symbolInfo =
-			ContentAssistParser.getSymbolInfo(JSFCoreUtilHelper.getDocumentContext(_jspFile, 579).getContext(), 1, "myBean");
-		assertNotNull(symbolInfo);
-		assertEquals("myBean", symbolInfo.getSymbol().getName());
-		assertTrue(symbolInfo.getSymbol() instanceof IBeanInstanceSymbol);
-		assertNotNull(symbolInfo.getRelativeRegion());
-		assertEquals(6, symbolInfo.getRelativeRegion().getLength());
-
-		// property test
-		symbolInfo =
-			ContentAssistParser.getSymbolInfo(JSFCoreUtilHelper.getDocumentContext(_jspFile, 614).getContext(), 8, "myBean.property");
-		assertNotNull(symbolInfo);
-		assertEquals("property", symbolInfo.getSymbol().getName());
-		assertTrue(symbolInfo.getSymbol() instanceof IBeanPropertySymbol);
-		assertNotNull(symbolInfo.getRelativeRegion());
-
-		// method test
-		symbolInfo =
-			ContentAssistParser.getSymbolInfo(JSFCoreUtilHelper.getDocumentContext(_jspFile, 706).getContext(), 8, "myBean.actionMethod");
-		assertNotNull(symbolInfo);
-		assertEquals("actionMethod", symbolInfo.getSymbol().getName());
-		assertTrue(symbolInfo.getSymbol() instanceof IBeanMethodSymbol);
-		assertNotNull(symbolInfo.getRelativeRegion());
-	}
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestFunctionCompletionStrategy.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestFunctionCompletionStrategy.java
deleted file mode 100644
index fc9677a..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestFunctionCompletionStrategy.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper;
-import org.eclipse.jst.jsf.core.tests.util.JSFFacetedTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JDTTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JSFTestUtil;
-import org.eclipse.jst.jsf.test.util.TestFileResource;
-import org.eclipse.jst.jsf.test.util.WebProjectTestEnvironment;
-
-/**
- * Basic unit test for class FunctionCompletionStrategy
- * @author cbateman
- *
- */
-public class TestFunctionCompletionStrategy extends BaseTestClass
-{
-    private WebProjectTestEnvironment       _testEnv;
-    private IFile							_jspFile;
-    private IType							_myBeanType;
-
-    @Override
-	protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        JSFTestUtil.setValidationEnabled(false);
-
-        _testEnv = new WebProjectTestEnvironment(getClass().getName()+"_"+getName());
-        _testEnv.createProject(false);
-        assertNotNull(_testEnv);
-        assertNotNull(_testEnv.getTestProject());
-        assertTrue(_testEnv.getTestProject().isAccessible());
-
-        final JSFFacetedTestEnvironment jsfFacedEnv = new JSFFacetedTestEnvironment(_testEnv);
-        jsfFacedEnv.initialize(IJSFCoreConstants.FACET_VERSION_1_1);
-
-        _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/faces-config_basic.xml.data",
-                                      "/WEB-INF/faces-config.xml");
-        _jspFile = (IFile) _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/basicELExpressions.jsp.data",
-                                      "/basicELExpressions.jsp");
-        assertNotNull(_jspFile);
-        assertTrue(_jspFile.isAccessible());
-
-        final JDTTestEnvironment jdtTestEnv = new JDTTestEnvironment(_testEnv);
-        final TestFileResource resource = new TestFileResource();
-        resource.load(ContentAssistTestsPlugin.getDefault().getBundle(),
-                      "/testdata/MyBean.java.data");
-        jdtTestEnv.addSourceFile("src", "beans", "MyBean", resource.toString());
-        _myBeanType = JavaCore.create(_testEnv.getTestProject()).findType("beans.MyBean");
-        assertNotNull(_myBeanType);
-        assertTrue(_myBeanType.exists());
-    }
-
-    /**
-     * Sanity check
-     */
-    public void testSanity() throws Exception
-    {
-    	JSFCoreUtilHelper.assertELSanity(_jspFile, 614, "value", "#{myBean.property}");
-    	JSFCoreUtilHelper.assertELSanity(_jspFile, 658, "value", "#{paramValues.foo}");
-    	JSFCoreUtilHelper.assertELSanity(_jspFile, 706, "action", "#{myBean.actionMethod}");
-
-    	JSFCoreUtilHelper.assertELVariableSanity(_jspFile, "myBean");
-    }
-
-    public void testFunctionCompletionStrategy() throws Exception
-    {
-    	// normal value binding only has properties
-    	List<ICompletionProposal>  proposals = getProposals(_jspFile, 614, 8);
-
-    	{
-	    	final Set<String> propNames = new HashSet<String>();
-	    	propNames.add("property");
-	    	propNames.add("class");
-	    	assertDisplayNamesMatch(propNames, proposals);
-    	}
-
-    	// method binding includes methods and also properties
-    	proposals = getProposals(_jspFile, 706, 8);
-
-    	{
-	    	final Set<String> propNames = new HashSet<String>();
-	    	propNames.add("property");
-	    	propNames.add("class");
-	    	propNames.add("getProperty");
-	    	propNames.add("actionMethod");
-	    	propNames.add("equals");
-	    	propNames.add("getClass");
-	    	propNames.add("hashCode");
-	    	propNames.add("notify");
-	    	propNames.add("notifyAll");
-	    	propNames.add("toString");
-	    	propNames.add("wait");
-	    	propNames.add("wait");
-	    	propNames.add("wait");
-
-	    	assertEquals(13, proposals.size());
-	    	// have to loop through explicitly here because wait appears
-	    	// in the list thrice, but can only be in the set once
-	    	for (final ICompletionProposal prop : proposals)
-	    	{
-	    		assertTrue(propNames.contains(prop.getDisplayString()));
-	    	}
-    	}
-    }
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestIdCompletionStrategy.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestIdCompletionStrategy.java
deleted file mode 100644
index 3ca76ee..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/TestIdCompletionStrategy.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper;
-import org.eclipse.jst.jsf.core.tests.util.JSFFacetedTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JDTTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JSFTestUtil;
-import org.eclipse.jst.jsf.test.util.TestFileResource;
-import org.eclipse.jst.jsf.test.util.WebProjectTestEnvironment;
-
-public class TestIdCompletionStrategy extends BaseTestClass
-{
-	private final static Set<String>   DISPLAY_NAMES;
-
-	static
-	{
-		final Set<String>  displayNames = new HashSet<String>();
-		displayNames.add("requestScope");
-		displayNames.add("cookie");
-		displayNames.add("header");
-		displayNames.add("headerValues");
-		displayNames.add("param");
-		displayNames.add("paramValues");
-		displayNames.add("facesContext");
-		displayNames.add("view");
-		displayNames.add("initParam");
-		displayNames.add("sessionScope");
-		displayNames.add("applicationScope");
-		displayNames.add("myBean");
-		DISPLAY_NAMES = Collections.unmodifiableSet(displayNames);
-	}
-	private WebProjectTestEnvironment _testEnv;
-	private IFile _jspFile;
-	private IType _myBeanType;
-
-
-	@Override
-	protected void setUp() throws Exception
-	{
-        super.setUp();
-
-        JSFTestUtil.setValidationEnabled(false);
-
-        _testEnv = new WebProjectTestEnvironment(getClass().getName()+"_"+getName());
-        _testEnv.createProject(false);
-        assertNotNull(_testEnv);
-        assertNotNull(_testEnv.getTestProject());
-        assertTrue(_testEnv.getTestProject().isAccessible());
-
-        final JSFFacetedTestEnvironment jsfFacedEnv = new JSFFacetedTestEnvironment(_testEnv);
-        jsfFacedEnv.initialize(IJSFCoreConstants.FACET_VERSION_1_1);
-
-        _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/faces-config_basic.xml.data",
-                                      "/WEB-INF/faces-config.xml");
-        _jspFile = (IFile) _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/basicELExpressions.jsp.data",
-                                      "/basicELExpressions.jsp");
-        assertNotNull(_jspFile);
-        assertTrue(_jspFile.isAccessible());
-
-        final JDTTestEnvironment jdtTestEnv = new JDTTestEnvironment(_testEnv);
-        final TestFileResource resource = new TestFileResource();
-        resource.load(ContentAssistTestsPlugin.getDefault().getBundle(),
-                      "/testdata/MyBean.java.data");
-        jdtTestEnv.addSourceFile("src", "beans", "MyBean", resource.toString());
-        _myBeanType = JavaCore.create(_testEnv.getTestProject()).findType("beans.MyBean");
-        assertNotNull(_myBeanType);
-        assertTrue(_myBeanType.exists());
-    }
-
-	public void testSanity() throws Exception
-	{
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 518, "value", "#{}");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 547, "value", "#{   }");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 579, "value", "#{myBean}");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 614, "value", "#{myBean.property}");
-		JSFCoreUtilHelper.assertELSanity(_jspFile, 658, "value", "#{paramValues.foo}");
-
-		assertEquals(12, DISPLAY_NAMES.size());
-	}
-
-	public void testGetProposals() {
-
-	}
-
-	public void testIdCompletionStrategy() throws Exception
-	{
-		// empty string has all
-		assertDisplayNamesMatch(DISPLAY_NAMES, getProposals(_jspFile, 518, "", 1));
-
-		// empty whitespace has all
-		assertDisplayNamesMatch(DISPLAY_NAMES, getProposals(_jspFile, 547, 1));
-
-		// at the very start of a variable, have all
-		assertDisplayNamesMatch(DISPLAY_NAMES, getProposals(_jspFile, 579, 1));
-		// one character in, only ones matching prefix
-		assertDisplayNamesMatch(Collections.singleton("myBean"), getProposals(_jspFile, 579, 2));
-
-		// having properties should not change the variable resolved
-		assertDisplayNamesMatch(DISPLAY_NAMES, getProposals(_jspFile, 614, 1));
-		// one character in, only ones matching prefix
-		assertDisplayNamesMatch(Collections.singleton("myBean"), getProposals(_jspFile, 614, 2));
-
-		// having properties should not change the variable resolved
-		assertDisplayNamesMatch(DISPLAY_NAMES, getProposals(_jspFile, 658, 1));
-		// one character in, only ones matching prefix
-		final Set<String> paramNames = new HashSet<String>();
-		paramNames.add("param");
-		paramNames.add("paramValues");
-		assertDisplayNamesMatch(Collections.unmodifiableSet(paramNames), getProposals(_jspFile, 658, 2));
-	}
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/Test_bug_149224.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/Test_bug_149224.java
deleted file mode 100644
index 07f65cc..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/Test_bug_149224.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import java.io.ByteArrayInputStream;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper;
-import org.eclipse.jst.jsf.core.tests.util.JSFFacetedTestEnvironment;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper.ContextWrapper;
-import org.eclipse.jst.jsf.test.util.JDTTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JSFTestUtil;
-import org.eclipse.jst.jsf.test.util.TestFileResource;
-import org.eclipse.jst.jsf.test.util.WebProjectTestEnvironment;
-
-/**
- * Regression test for 149224 -- replace '.' on completion with [] style of
- * map
- *
- * @author cbateman
- *
- */
-public class Test_bug_149224 extends BaseTestClass
-{
-    private WebProjectTestEnvironment       _testEnv;
-    private IFile							_jspFile;
-
-    @Override
-	protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        JSFTestUtil.setValidationEnabled(false);
-
-        _testEnv = new WebProjectTestEnvironment("Test_bug_149224_"+getName());
-        _testEnv.createProject(false);
-        assertNotNull(_testEnv);
-        assertNotNull(_testEnv.getTestProject());
-        assertTrue(_testEnv.getTestProject().isAccessible());
-
-        final JSFFacetedTestEnvironment jsfFacedEnv = new JSFFacetedTestEnvironment(_testEnv);
-        jsfFacedEnv.initialize(IJSFCoreConstants.FACET_VERSION_1_1);
-
-        _jspFile = (IFile) _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/bug_149224_1.jsp.data",
-                                      "/bug_149224.jsp");
-
-        assertNotNull(_jspFile);
-        assertTrue(_jspFile.isAccessible());
-
-        final JDTTestEnvironment jdtTestEnv = new JDTTestEnvironment(_testEnv);
-        TestFileResource resource = new TestFileResource();
-        resource.load(ContentAssistTestsPlugin.getDefault().getBundle(),
-                      "/testdata/MyBean.java.data");
-        jdtTestEnv.addSourceFile("src", "beans", "MyBean", resource.toString());
-
-        resource = new TestFileResource();
-        resource.load(ContentAssistTestsPlugin.getDefault().getBundle(),
-                      "/testdata/bug_149224.properties.data");
-        jdtTestEnv.addResourceFile("src", new ByteArrayInputStream(resource.toBytes()),
-                                   "bundles", "bundle1.properties");
-    }
-
-    /**
-     * Sanity check
-     */
-    public void testSanity() throws Exception
-    {
-        final ContextWrapper wrapper = null;
-
-        try
-        {
-        	JSFCoreUtilHelper.assertELSanity(_jspFile, 589, "value", "#{bundle1.}");
-        	JSFCoreUtilHelper.assertELSanity(_jspFile, 630, "value", "#{bundle1.x}");
-        	JSFCoreUtilHelper.assertELVariableSanity(_jspFile, "bundle1");
-        }
-        finally
-        {
-            if (wrapper != null)
-            {
-                wrapper.dispose();
-            }
-        }
-    }
-
-    /**
-     * Test the completion:
-     *
-     *      # { b u n d l e 1 . }
-     *                         ^
-     */
-	public void testCompletionAtCloseBrace() throws Exception
-    {
-		final List<ICompletionProposal> proposals =
-			getProposals(_jspFile, 589, "bundle1.",9);
-		assertNotNull(proposals);
-        ICompletionProposal proposal = null;
-
-        FIND_ARRAY_PROPOSAL:
-            for (final ICompletionProposal findProp : proposals)
-        {
-            // TODO: this is a bit of a hack.  Would rather be able
-            // to query for the actual replacement text
-            if (findProp.getDisplayString().startsWith("['"))
-            {
-            	proposal = findProp;
-                break FIND_ARRAY_PROPOSAL;
-            }
-        }
-
-        assertNotNull(proposal);
-
-        applyAndCheck(_jspFile, 589, proposal, "bundle1['prop.with.dots_x']");
-    }
-
-    /**
-     * Test the completion:
-     *
-     *      # { b u n d l e 1 . x }
-     *                         ^
-     */
-	public void testCompletionAtProperty() throws Exception
-    {
-        final ContextWrapper wrapper = null;
-
-        try
-        {
-            final List<ICompletionProposal> proposals =
-            	getProposals(_jspFile, 630, 9);
-
-            ICompletionProposal proposal = null;
-
-            FIND_ARRAY_PROPOSAL:
-                for (final ICompletionProposal completionProposal : proposals) {
-				    proposal = completionProposal;
-				    // TODO: this is a bit of a hack.  Would rather be able
-				    // to query for the actual replacement text
-				    if (proposal.getDisplayString().startsWith("['"))
-				    {
-				        break FIND_ARRAY_PROPOSAL;
-				    }
-				}
-
-            assertNotNull(proposal);
-            applyAndCheck(_jspFile, 630, proposal, "bundle1['prop.with.dots_x']x");
-        }
-        finally
-        {
-            if (wrapper != null)
-            {
-                wrapper.dispose();
-            }
-        }
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/Test_bug_149743.java b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/Test_bug_149743.java
deleted file mode 100644
index 3d5c5d8..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/src/org/eclipse/jst/jsf/contentassist/tests/Test_bug_149743.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.contentassist.tests;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-import org.eclipse.jst.jsf.core.tests.util.JSFCoreUtilHelper;
-import org.eclipse.jst.jsf.core.tests.util.JSFFacetedTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JDTTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JSFTestUtil;
-import org.eclipse.jst.jsf.test.util.TestFileResource;
-import org.eclipse.jst.jsf.test.util.WebProjectTestEnvironment;
-
-/**
- * Test a situation where no expected return type information is
- * available for a tag.
- *
- * @author cbateman
- *
- */
-public class Test_bug_149743 extends BaseTestClass
-{
-    private WebProjectTestEnvironment       _testEnv;
-    private IFile							_jspFile;
-
-    @Override
-	protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        JSFTestUtil.setValidationEnabled(false);
-
-        _testEnv = new WebProjectTestEnvironment("Test_bug_149743_"+getName());
-        _testEnv.createProject(false);
-        assertNotNull(_testEnv);
-        assertNotNull(_testEnv.getTestProject());
-        assertTrue(_testEnv.getTestProject().isAccessible());
-
-        final JSFFacetedTestEnvironment jsfFacedEnv = new JSFFacetedTestEnvironment(_testEnv);
-        jsfFacedEnv.initialize(IJSFCoreConstants.FACET_VERSION_1_1);
-
-        _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/faces-config_bug149743.xml.data",
-                                      "/WEB-INF/faces-config.xml");
-        _jspFile = (IFile) _testEnv.loadResourceInWebRoot(ContentAssistTestsPlugin.getDefault().getBundle(),
-                                      "/testdata/bug_149743.jsp.data",
-                                      "/bug_149743.jsp");
-
-        final JDTTestEnvironment jdtTestEnv = new JDTTestEnvironment(_testEnv);
-        final TestFileResource resource = new TestFileResource();
-        resource.load(ContentAssistTestsPlugin.getDefault().getBundle(),
-                      "/testdata/MyBean.java.data");
-        jdtTestEnv.addSourceFile("src", "beans", "MyBean", resource.toString());
-    }
-
-    /**
-     * Sanity check
-     */
-    public void testSanity() throws Exception
-    {
-    	JSFCoreUtilHelper.assertELSanity(_jspFile, 529, "value" ,"#{myBean.property}");
-    	JSFCoreUtilHelper.assertELVariableSanity(_jspFile, "myBean");
-    }
-
-    /**
-     * Checks the scenario for Test_bug_149743
-     */
-    public void testCompletionProposalsForId() throws Exception
-    {
-        final List<ICompletionProposal> proposals =
-        	getProposals(_jspFile, 529, 8);
-        assertEquals(2, proposals.size());
-        final Set<String>  names = new HashSet<String>();
-
-        for (final ICompletionProposal proposal : proposals)
-        {
-            names.add(proposal.getDisplayString());
-        }
-        assertTrue(names.contains("class"));
-        assertTrue(names.contains("property"));
-    }
-
-
-
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/test.xml b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/test.xml
deleted file mode 100644
index e59e084..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
-	<echo message="basedir ${basedir}" />
-	<echo message="eclipse place ${eclipse-home}" />
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jst.jsf.contentassist.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org.eclipse.jst.jsf.contentassist.tests.*xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jsf-folder" value="${eclipse-home}/jsf_folder"/>
-    <delete dir="${jsf-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jsf-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.jsf.contentassist.tests.AllTests" />
-   	<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org.eclipse.jst.jsf.contentassist.tests.*xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>
-\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/MyBean.java.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/MyBean.java.data
deleted file mode 100644
index 7de1772..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/MyBean.java.data
+++ /dev/null
@@ -1,13 +0,0 @@
-package beans;
-
-public class MyBean {
-	public String[] getProperty()
-	{
-		return new String[]{"blah"};
-	}
-
-	public String actionMethod()
-	{
-		return "foo";
-	}
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/MyBeanSettable.java.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/MyBeanSettable.java.data
deleted file mode 100644
index 7edb245..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/MyBeanSettable.java.data
+++ /dev/null
@@ -1,171 +0,0 @@
-package beans;
-
-import java.math.BigInteger;
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-public class MyBeanSettable
-{
-	public String getStringProperty()
-	{
-		return "";
-	}
-	
-	public void setStringProperty(String stringProp)
-	{
-		
-	}
-
-	public double getDoubleProperty()
-	{
-		return 1.04;
-	}
-	
-	public void setDoubleProperty(double newValue)
-	{
-		// doesn't matter what happens here
-	}
-
-	public void setIntegerProperty(int integerProp)
-	{
-		
-	}
-
-	public int getIntegerProperty()
-	{
-		return 0;
-	}
-
-	public boolean getBooleanProperty()
-	{
-		return false;
-	}
-	
-	public void setBooleanProperty(boolean booleanProp)
-	{
-		
-	}
-	
-	public Map getMapProperty()
-	{
-		return Collections.EMPTY_MAP;
-	}
-	
-	public void setMapProperty(Map mapProperty)
-	{
-		
-	}
-	
-	public void setStringArrayProperty(String[] stringArrayProperty)
-	{
-		
-	}
-	
-	public String[] getStringArrayProperty()
-	{
-		return new String[0];
-	}
-	
-	public Collection getCollectionProperty()
-	{
-		return Collections.EMPTY_LIST;
-	}
-	
-	public void setCollectionProperty(Collection collectionProp)
-	{
-		
-	}
-
-	public void setListProperty(List listProp)
-	{
-		
-	}
-	
-	public List getListProperty()
-	{
-		return Collections.EMPTY_LIST;
-	}
-
-	public void setComparablePropety(Comparable comp)
-	{
-		
-	}
-	
-	public Comparable getComparableProperty()
-	{
-		return null;
-	}
-	
-	public MyBeanSettable recursiveCall()
-	{
-		return this;
-	}
-	
-	public String getWritableStringProperty()
-	{
-		return "";
-	}
-	
-	public void setWritableStringProperty(String newValue)
-	{
-		;
-	}
-	
-	public BigInteger getBigIntegerProperty()
-	{
-		return BigInteger.ONE;
-	}
-	
-	public void setBigIntegerProperty(BigInteger newValue)
-	{
-		// doesn't matter what happens here
-	}
-	
-	public BigDecimal getBigDoubleProperty()
-	{
-		return new BigDecimal(0.5);
-	}
-	
-	public void setBigDoubleProperty(BigDecimal newValue)
-	{
-		// doesn't matter what happens here
-	}
-	
-	public void validate(FacesContext facesContext, 
-					      UIComponent component,
-					      Object object
-					      )
-	{
-		
-	}
-
-	public void validate2(FacesContext facesContext, 
-		      UIComponent component,
-		      Object[] object
-		      )
-	{
-	
-	}	
-	
-	public MyBeanSettable getSelf()
-	{
-		return this;
-	}
-	
-	public boolean isIsStyleBooleanProperty()
-	{
-		return false;
-	}
-	
-	public void setIsStyleBooleanProperty(boolean styleProp)
-	{
-		
-	}
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/basicELExpressions.jsp.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/basicELExpressions.jsp.data
deleted file mode 100644
index aba8370..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/basicELExpressions.jsp.data
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
- 
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>JSP Page</title>
-    </head>
-    <body>
-    <f:view>
-    <h1>JSP Page</h1>
-    	<!--  no errors -->
-	<h:outputText value="#{}"/>
-	<h:outputText value="#{   }"/>
-	<h:outputText value="#{myBean}"/>
-	<h:outputText value="#{myBean.property}"/>
-	<h:outputText value="#{paramValues.foo}"/>
-	<h:commandButton action="#{myBean.actionMethod}"/>
-    </f:view>
-    </body>
-</html>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149224.properties.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149224.properties.data
deleted file mode 100644
index d29c89a..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149224.properties.data
+++ /dev/null
@@ -1,4 +0,0 @@
-prop1_x=foo
-prop2_x=bar
-prop.with.dots_x=foo.bar
-anotherprop=blah
-\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149224_1.jsp.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149224_1.jsp.data
deleted file mode 100644
index aba64ef..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149224_1.jsp.data
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
-
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>JSP Page</title>
-    </head>
-    <body>
-    <f:view>
-    <f:loadBundle basename="bundles.bundle1" var="bundle1"/>
-    <h1>JSP Page</h1>
-    	<!--  no errors -->
-    	<h:outputText value="#{bundle1.}"/>
-    	<h:outputText value="#{bundle1.x}"/>
-    </f:view>
-    </body>
-</html>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149743.jsp.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149743.jsp.data
deleted file mode 100644
index 5a68a6c..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/bug_149743.jsp.data
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
- 
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>JSP Page</title>
-    </head>
-    <body>
-    <f:view>
-    <h1>JSP Page</h1>
-    	<!--  no errors -->
-    	<f:selectItems value="#{myBean.property}"/>
-    </f:view>
-    </body>
-</html>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/faces-config_basic.xml.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/faces-config_basic.xml.data
deleted file mode 100644
index e4a475b..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/faces-config_basic.xml.data
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE faces-config PUBLIC
-    "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-    "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
-	<managed-bean>
-		<managed-bean-name>
-		myBean</managed-bean-name>
-		<managed-bean-class>
-		beans.MyBean</managed-bean-class>
-		<managed-bean-scope>
-		none</managed-bean-scope>
-	</managed-bean>
-
-</faces-config>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/faces-config_bug149743.xml.data b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/faces-config_bug149743.xml.data
deleted file mode 100644
index 5db9cf5..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/testdata/faces-config_bug149743.xml.data
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE faces-config PUBLIC
-    "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-    "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
-	<managed-bean>
-		<managed-bean-name>
-		myBean</managed-bean-name>
-		<managed-bean-class>
-		beans.MyBean</managed-bean-class>
-		<managed-bean-scope>
-		none</managed-bean-scope>
-	</managed-bean>
-
-</faces-config>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.classpath b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.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.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.cvsignore b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.cvsignore
deleted file mode 100644
index 3927467..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-temp.folder
-build.xml
-javaCompiler...args
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.project b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.project
deleted file mode 100644
index 28a1842..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsf.context.symbol.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/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.settings/org.eclipse.core.resources.prefs b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 9c7d20e..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:01:57 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.settings/org.eclipse.jdt.core.prefs b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 444ca5c..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,62 +0,0 @@
-#Tue May 15 17:20:53 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3f69302..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.jsf.context.symbol.tests; singleton:=true
-Bundle-Version: 1.1.1.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsf.context.symbol.tests;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.junit;bundle-version="[3.8.1,4.0.0)",
- org.eclipse.jst.jsf.test.util;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.core.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.core;bundle-version="1.1.103"
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.jst.jsf.context.symbol.tests.ContextSymbolTestPlugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/about.html b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/about.html
deleted file mode 100644
index 04d4782..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
- 
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is 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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/build.properties b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/build.properties
deleted file mode 100644
index e5db9e1..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-jars.compile.order = .
-javacSource=1.5
-javacTarget=1.5
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               test.xml,\
-               testdata/,\
-               plugin.properties,\
-               about.html
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/plugin.properties
deleted file mode 100644
index a584e7e..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/plugin.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName=JavaServer Faces Tools - Context Symbol Tests
-providerName=Eclipse.org
-
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/AllTests.java b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/AllTests.java
deleted file mode 100644
index 4246a4b..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/AllTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Test suite for all context.symbol tests
- * 
- * @author cbateman
- *
- */
-public class AllTests {
-    /**
-     * @return the all tests suite
-     */
-    public static Test suite() 
-    {
-        TestSuite suite = new TestSuite("Test for base symbols framework");
-        //$JUnit-BEGIN$
-        suite.addTestSuite(TestIJavaTypeDescriptor2.class);
-        suite.addTestSuite(TestIPropertySymbolItemProvider.class);
-        suite.addTestSuite(TestTypeCoercion.class);
-        // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=217135
-       // suite.addTestSuite(TestIJavaTypeDescriptor2_ChangeStability.class);
-        //$JUnit-END$
-        return suite;
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ContextSymbolTestPlugin.java b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ContextSymbolTestPlugin.java
deleted file mode 100644
index 51f59d2..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ContextSymbolTestPlugin.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Cameron Bateman/Oracle - initial API and implementation
- *    
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ContextSymbolTestPlugin extends AbstractUIPlugin 
-{
-	/**
-	 * The plug-in ID
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.jst.jsf.context.symbol.tests";
-
-	// The shared instance
-	private static ContextSymbolTestPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public ContextSymbolTestPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static ContextSymbolTestPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ModelBaseTestCase.java b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ModelBaseTestCase.java
deleted file mode 100644
index f91472f..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ModelBaseTestCase.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Cameron Bateman/Oracle - initial API and implementation
- *    
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.tests;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.test.util.JDTTestEnvironment;
-import org.eclipse.jst.jsf.test.util.JSFTestUtil;
-import org.eclipse.jst.jsf.test.util.TestFileResource;
-import org.eclipse.jst.jsf.test.util.WebProjectTestEnvironment;
-import org.osgi.framework.Bundle;
-
-/**
- * @author cbateman
- *
- */
-public class ModelBaseTestCase extends TestCase 
-{
-    /**
-     * The test environment for a JavaProject
-     */
-    protected JDTTestEnvironment      _jdtTestEnvironment;
-    
-    /**
-     * The base source folder name for Java classes
-     */
-    protected final static String srcFolderName = "src";
-
-    protected void setUp() throws Exception 
-    {
-        super.setUp();
-        
-        JSFTestUtil.setValidationEnabled(false);
-        JSFTestUtil.setInternetProxyPreferences(true, "www-proxy.uk.oracle.com", "80");
-
-        final WebProjectTestEnvironment  projectTestEnvironment = 
-            new WebProjectTestEnvironment("TestJDTBeanIntrospectorProject_"+getName());
-        projectTestEnvironment.createProject(true);
-        
-        _jdtTestEnvironment = new JDTTestEnvironment(projectTestEnvironment);
-    }
-
-    /**
-     * @param bundle
-     * @param fileName
-     * @param packageName
-     * @param beanClassName
-     * @throws Exception
-     */
-    protected void loadSourceClass(final Bundle bundle, final String fileName, final String packageName, final String beanClassName) throws Exception
-    {
-        TestFileResource codeRes = new TestFileResource();
-        codeRes.load(bundle, fileName);
-        String code = codeRes.toString();
-        _jdtTestEnvironment.addSourceFile(srcFolderName, packageName, beanClassName, code);
-        assertNotNull(_jdtTestEnvironment.getJavaProject().findType(packageName+"."+beanClassName));
-    }
-    
-    /**
-     * @param bundle 
-     * @param fileName
-     * @param packageName
-     * @param beanClassName
-     * @param properties
-     * @return a bean instance set up for the indicated test class
-     * @throws Exception
-     */
-    protected IBeanInstanceSymbol setupBeanProperty(Bundle bundle, String fileName, String packageName, String beanClassName, Map<String, IPropertySymbol> properties) throws Exception
-    {
-        loadSourceClass(bundle, fileName, packageName, beanClassName);
-        
-        final IType testBean1Type = 
-            _jdtTestEnvironment.getJavaProject().findType(packageName+"."+beanClassName);
-        assertNotNull(testBean1Type);
-        
-        final IJavaTypeDescriptor2 testBeanDescriptor = 
-            SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
-        testBeanDescriptor.setType(testBean1Type);
-        
-        IBeanInstanceSymbol  bean = 
-            SymbolFactory.eINSTANCE.createIBeanInstanceSymbol();
-        bean.setTypeDescriptor(testBeanDescriptor);
-        bean.setName(beanClassName);
-        populatePropertyMap(bean, properties);
-        return bean;
-    }
-    
-    protected void populatePropertyMap(IBeanInstanceSymbol bean, Map<String, IPropertySymbol> properties)
-    {
-        List<?> propertyList = bean.getProperties();
-        for(final Iterator<?> it = propertyList.iterator(); it.hasNext();)
-        {
-            final IPropertySymbol  property = (IPropertySymbol) it.next();
-            properties.put(property.getName(), property);
-        }
-    }
-}
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/TestIJavaTypeDescriptor2.java b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/TestIJavaTypeDescriptor2.java
deleted file mode 100644
index 20707a3..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/TestIJavaTypeDescriptor2.java
+++ /dev/null
@@ -1,1099 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Cameron Bateman/Oracle - initial API and implementation
- *    
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.tests;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.core.tests.TestsPlugin;
-
-/**
- * Test the IJavaTypeDescriptor
- * 
- * @author cbateman
- *
- */
-public class TestIJavaTypeDescriptor2 extends ModelBaseTestCase 
-{
-    private Map                     _beanProperties;
-    private Map                     _beanSubclassProperties;
-    private Map<String, IBeanMethodSymbol>  _beanMethods;
-    private Map                     _beanMethodsSubclass;     
-    private Map<String, IPropertySymbol> _genericProperties;
-    
-    private IBeanInstanceSymbol     _testBean1Symbol;
-    private IBeanInstanceSymbol     _testBean1SubclassSymbol;
-    private IBeanInstanceSymbol     _testBean2Symbol;
-    private IBeanInstanceSymbol     _testBean2SubclassSymbol;
-    
-    private final static String packageName1 = "com.test";
-    private final static String testBeanName1 = "TestBean1";
-    private final static String testBean1Sig = "L"+packageName1+"."+testBeanName1+";";
-    private final static String testBeanSubclass1 = "TestBean1Subclass";
-    private final static String testBeanName2 = "TestBean2";
-    private final static String testBean2Subclass = "TestBean2Subclass";
-
-    private final static String overloadedMethodName = "overloadedMethod";
-    
-    @SuppressWarnings("unchecked")
-	protected void setUp() throws Exception 
-    {
-        super.setUp();
-
-        // load ITestBean2 first due to later dependencies
-        loadSourceClass(ContextSymbolTestPlugin.getDefault().getBundle(), "/testdata/ITestBean2.java.data", packageName1, "ITestBean2");
-        
-        // load another bean first since others have a dependency on on it
-        loadSourceClass(TestsPlugin.getDefault().getBundle(), "/testfiles/AnotherBean.java.data", packageName1, "AnotherBean");
-        assertNotNull(_jdtTestEnvironment.getJavaProject().findType(packageName1+"."+"AnotherBean"));
-        
-        _beanProperties = new HashMap();
-        _testBean1Symbol =
-            setupBeanProperty(TestsPlugin.getDefault().getBundle(), 
-                              "/testfiles/TestBean1.java.data", packageName1, 
-                              testBeanName1, _beanProperties);
-        
-        _beanSubclassProperties = new HashMap();
-        _testBean1SubclassSymbol =
-            setupBeanProperty(TestsPlugin.getDefault().getBundle(), 
-                              "/testfiles/TestBean1Subclass.java.data", packageName1, 
-                              testBeanSubclass1, _beanSubclassProperties);
-
-        _genericProperties = new HashMap<String, IPropertySymbol>();
-        
-        setupBeanProperty(ContextSymbolTestPlugin.getDefault().getBundle(),
-                    "/testdata/TestBeanWithGenericProperties.java.data", packageName1, 
-                    "TestBeanWithGenericProperties",_genericProperties);
-
-        _beanMethods = new HashMap();
-        _testBean2Symbol = 
-            setupBeanMethods("/testdata/TestBean2.java.data", testBeanName2, _beanMethods);
-
-        _beanMethodsSubclass = new HashMap();
-        _testBean2SubclassSymbol = 
-            setupBeanMethods("/testdata/TestBean2Subclass.java.data", testBean2Subclass, _beanMethodsSubclass);
-    }
-
-    private IBeanInstanceSymbol setupBeanMethods(String fileName, String beanClassName, Map<String, IBeanMethodSymbol> methods) throws Exception
-    {
-        loadSourceClass(ContextSymbolTestPlugin.getDefault().getBundle(), fileName, packageName1, beanClassName);
-
-        final IType testBean1Type = 
-            _jdtTestEnvironment.getJavaProject().findType(packageName1+"."+beanClassName);
-        assertNotNull(testBean1Type);
-        
-        final IJavaTypeDescriptor2 testBeanDescriptor = 
-            SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
-        testBeanDescriptor.setType(testBean1Type);
-        
-        IBeanInstanceSymbol  bean = 
-            SymbolFactory.eINSTANCE.createIBeanInstanceSymbol();
-        bean.setTypeDescriptor(testBeanDescriptor);
-        bean.setName(beanClassName);
-        List methodList = bean.getMethods();
-        for(final Iterator it = methodList.iterator(); it.hasNext();)
-        {
-            final IBeanMethodSymbol  method = (IBeanMethodSymbol) it.next();
-
-            // exclude the overloaded methods as these are handled separately
-            if (!overloadedMethodName.equals(method.getName()))
-            {
-                methods.put(method.getName(), method);
-            }
-        }
-        
-        return bean;
-    }
-    
-    /**
-     * Basic high-level sanity check on the generate properties map
-     */
-    public void testMapSanity()
-    {
-        final int NUM_PROPS_IN_BEAN = 15; // includes getClass on parent java.lang.Object
-        assertEquals("Check extra or missing properties",NUM_PROPS_IN_BEAN, _beanProperties.size());
-        assertEquals("Check extra or missing properties",NUM_PROPS_IN_BEAN+1, _beanSubclassProperties.size());
-        assertEquals("Check extra or missing methods",12,_beanMethods.size()); // includes java.lang.Object methods
-        assertEquals("Check extra or missing methods",13,_beanMethodsSubclass.size());
-        assertEquals("Check extra or missing methods", 5, _genericProperties.size());
-    }
-    
-    /**
-     * 
-     */
-    public void testStringProp1()
-    {
-        testStringProp1(_beanProperties);
-    }
-    
-    /**
-     * test inherited
-     */
-    public void testStringProp1SubClass()
-    {
-        testStringProp1(_beanSubclassProperties);
-    }
-    
-    /**
-     * @param properties
-     */
-    private void testStringProp1(Map properties)
-    {
-        IBeanPropertySymbol  property = 
-            (IBeanPropertySymbol) properties.get("stringProp1");
-        assertNotNull(property);
-        
-        assertTrue(property.isReadable());
-        assertTrue(property.isWritable());
-        assertEquals("Signature must be for a String", 
-                        "Ljava.lang.String;", property.getTypeDescriptor().getTypeSignature());
-    }
-    
-    /**
-     * test property
-     */
-    public void testBooleanIsProp1()
-    {
-        testBooleanIsProp1(_beanProperties);
-    }
-    
-    /**
-     * test inherited
-     */
-    public void testBooleanIsProp1SubClass()
-    {
-        testBooleanIsProp1(_beanSubclassProperties);
-    }
-
-    
-    /**
-     * @param properties
-     */
-    private void testBooleanIsProp1(Map properties)
-    {
-        IBeanPropertySymbol  property = 
-            (IBeanPropertySymbol) properties.get("booleanIsProp1");
-        assertNotNull(property);
-        
-        assertTrue(property.isReadable());
-        assertTrue(property.isWritable());
-        assertEquals("Signature must be for a boolean", 
-                        Signature.SIG_BOOLEAN, property.getTypeDescriptor().getTypeSignature());
-    }
-    
-    /**
-     * 
-     */
-    public void testBooleanIsProp2()