This commit was manufactured by cvs2svn to create branch
'R1_5_5_patches_patches'.
diff --git a/assembly/features/org.eclipse.jst.feature/.cvsignore b/assembly/features/org.eclipse.jst.feature/.cvsignore
deleted file mode 100644
index 3510d24..0000000
--- a/assembly/features/org.eclipse.jst.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.wst_1.0.0.jar
-org.eclipse.jst_1.0.0.jar
-org.eclipse.jst_1.0.0.bin.dist.zip
diff --git a/assembly/features/org.eclipse.jst.feature/.project b/assembly/features/org.eclipse.jst.feature/.project
deleted file mode 100644
index 10f84d4..0000000
--- a/assembly/features/org.eclipse.jst.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.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/assembly/features/org.eclipse.jst.feature/.settings/org.eclipse.core.resources.prefs b/assembly/features/org.eclipse.jst.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 668d02c..0000000
--- a/assembly/features/org.eclipse.jst.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 13 22:00:58 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/features/org.eclipse.jst.feature/.settings/org.eclipse.pde.prefs b/assembly/features/org.eclipse.jst.feature/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08865f1..0000000
--- a/assembly/features/org.eclipse.jst.feature/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 15:42:26 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/assembly/features/org.eclipse.jst.feature/build.properties b/assembly/features/org.eclipse.jst.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/assembly/features/org.eclipse.jst.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/assembly/features/org.eclipse.jst.feature/eclipse_update_120.jpg b/assembly/features/org.eclipse.jst.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.jst.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.jst.feature/epl-v10.html b/assembly/features/org.eclipse.jst.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.jst.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/assembly/features/org.eclipse.jst.feature/feature.properties b/assembly/features/org.eclipse.jst.feature/feature.properties
deleted file mode 100644
index 9ed4442..0000000
--- a/assembly/features/org.eclipse.jst.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=J2EE Standard Tools (JST) Project
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST project runtime
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.jst.feature/feature.xml b/assembly/features/org.eclipse.jst.feature/feature.xml
deleted file mode 100644
index 1b011bb..0000000
--- a/assembly/features/org.eclipse.jst.feature/feature.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.jst"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.common_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.server_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.enterprise_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.server_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.server_adapters.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.enterprise_ui.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.jst.feature/license.html b/assembly/features/org.eclipse.jst.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/assembly/features/org.eclipse.jst.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/assembly/features/org.eclipse.jst.sdk/.cvsignore b/assembly/features/org.eclipse.jst.sdk/.cvsignore
deleted file mode 100644
index 05c7a1e..0000000
--- a/assembly/features/org.eclipse.jst.sdk/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-features
-plugins
-org.eclipse.jst.sdk_1.0.0.bin.dist.zip
diff --git a/assembly/features/org.eclipse.jst.sdk/.project b/assembly/features/org.eclipse.jst.sdk/.project
deleted file mode 100644
index 9e71e40..0000000
--- a/assembly/features/org.eclipse.jst.sdk/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.sdk</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/assembly/features/org.eclipse.jst.sdk/.settings/org.eclipse.core.resources.prefs b/assembly/features/org.eclipse.jst.sdk/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 668d02c..0000000
--- a/assembly/features/org.eclipse.jst.sdk/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 13 22:00:58 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/features/org.eclipse.jst.sdk/.settings/org.eclipse.pde.prefs b/assembly/features/org.eclipse.jst.sdk/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08865f1..0000000
--- a/assembly/features/org.eclipse.jst.sdk/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 15:42:26 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/assembly/features/org.eclipse.jst.sdk/build.properties b/assembly/features/org.eclipse.jst.sdk/build.properties
deleted file mode 100644
index 08ed19d..0000000
--- a/assembly/features/org.eclipse.jst.sdk/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               eclipse_update_120.jpg,\
-               epl-v10.html
diff --git a/assembly/features/org.eclipse.jst.sdk/eclipse_update_120.jpg b/assembly/features/org.eclipse.jst.sdk/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.jst.sdk/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.jst.sdk/epl-v10.html b/assembly/features/org.eclipse.jst.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.jst.sdk/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/assembly/features/org.eclipse.jst.sdk/feature.properties b/assembly/features/org.eclipse.jst.sdk/feature.properties
deleted file mode 100644
index 1014a54..0000000
--- a/assembly/features/org.eclipse.jst.sdk/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=J2EE Standard Tools (JST) Project SDK
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST project SDK
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
deleted file mode 100644
index 896b867..0000000
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.sdk"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.jst"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.common_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.server_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.enterprise_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.doc.isv.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst"
-         version="0.0.0"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.jst.sdk/license.html b/assembly/features/org.eclipse.jst.sdk/license.html
deleted file mode 100644
index 2347060..0000000
--- a/assembly/features/org.eclipse.jst.sdk/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/assembly/features/org.eclipse.jst.tests/.cvsignore b/assembly/features/org.eclipse.jst.tests/.cvsignore
deleted file mode 100644
index f744960..0000000
--- a/assembly/features/org.eclipse.jst.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.tests_1.0.0.bin.dist.zip
diff --git a/assembly/features/org.eclipse.jst.tests/.settings/org.eclipse.core.resources.prefs b/assembly/features/org.eclipse.jst.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 668d02c..0000000
--- a/assembly/features/org.eclipse.jst.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 13 22:00:58 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/features/org.eclipse.jst.tests/.settings/org.eclipse.pde.prefs b/assembly/features/org.eclipse.jst.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08865f1..0000000
--- a/assembly/features/org.eclipse.jst.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 15:42:26 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/assembly/features/org.eclipse.jst.tests/build.properties b/assembly/features/org.eclipse.jst.tests/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/assembly/features/org.eclipse.jst.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/assembly/features/org.eclipse.jst.tests/eclipse_update_120.jpg b/assembly/features/org.eclipse.jst.tests/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.jst.tests/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.jst.tests/epl-v10.html b/assembly/features/org.eclipse.jst.tests/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.jst.tests/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/assembly/features/org.eclipse.jst.tests/feature.properties b/assembly/features/org.eclipse.jst.tests/feature.properties
deleted file mode 100644
index 36e578d..0000000
--- a/assembly/features/org.eclipse.jst.tests/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=J2EE Standard Tools (JST) Project Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=JST project tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.jst.tests/feature.xml b/assembly/features/org.eclipse.jst.tests/feature.xml
deleted file mode 100644
index 823a799..0000000
--- a/assembly/features/org.eclipse.jst.tests/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.tests"
-      label="%featureName"
-      version="1.5.1.qualifier"
-      provider-name="%providerName">
-   <install-handler/>
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.server_tests.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_tests.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.enterprise_tests.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.jst.tests/license.html b/assembly/features/org.eclipse.jst.tests/license.html
deleted file mode 100644
index 2347060..0000000
--- a/assembly/features/org.eclipse.jst.tests/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/assembly/features/org.eclipse.wst.feature/.cvsignore b/assembly/features/org.eclipse.wst.feature/.cvsignore
deleted file mode 100644
index 84feec8..0000000
--- a/assembly/features/org.eclipse.wst.feature/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst_1.0.0.bin.dist.zip
-org.eclipse.wst_0.7.0.bin.dist.zip
diff --git a/assembly/features/org.eclipse.wst.feature/.project b/assembly/features/org.eclipse.wst.feature/.project
deleted file mode 100644
index f7ee9e7..0000000
--- a/assembly/features/org.eclipse.wst.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.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/assembly/features/org.eclipse.wst.feature/.settings/org.eclipse.core.resources.prefs b/assembly/features/org.eclipse.wst.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 668d02c..0000000
--- a/assembly/features/org.eclipse.wst.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 13 22:00:58 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/features/org.eclipse.wst.feature/.settings/org.eclipse.pde.prefs b/assembly/features/org.eclipse.wst.feature/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08865f1..0000000
--- a/assembly/features/org.eclipse.wst.feature/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 15:42:26 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/assembly/features/org.eclipse.wst.feature/build.properties b/assembly/features/org.eclipse.wst.feature/build.properties
deleted file mode 100644
index 6bcd28c..0000000
--- a/assembly/features/org.eclipse.wst.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/assembly/features/org.eclipse.wst.feature/eclipse_update_120.jpg b/assembly/features/org.eclipse.wst.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.wst.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.wst.feature/epl-v10.html b/assembly/features/org.eclipse.wst.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.wst.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/assembly/features/org.eclipse.wst.feature/feature.properties b/assembly/features/org.eclipse.wst.feature/feature.properties
deleted file mode 100644
index ab3271c..0000000
--- a/assembly/features/org.eclipse.wst.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Web Standard Tools (WST) Project
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST project runtime
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.wst.feature/feature.xml b/assembly/features/org.eclipse.wst.feature/feature.xml
deleted file mode 100644
index 6819371..0000000
--- a/assembly/features/org.eclipse.wst.feature/feature.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.wst"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.apache.xerces.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.commons_logging.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.jakarta_log4j.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.axis.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.wsil4j.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.uddi4j.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.wsdl4j.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.ws_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.rdb_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.rdb_adapters.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.wst.feature/license.html b/assembly/features/org.eclipse.wst.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/assembly/features/org.eclipse.wst.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/assembly/features/org.eclipse.wst.sdk/.cvsignore b/assembly/features/org.eclipse.wst.sdk/.cvsignore
deleted file mode 100644
index 1e51adf..0000000
--- a/assembly/features/org.eclipse.wst.sdk/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.wst.sdk_0.7.0.bin.dist.zip
-features
-plugins
-org.eclipse.wst.sdk_1.0.0.bin.dist.zip
diff --git a/assembly/features/org.eclipse.wst.sdk/.project b/assembly/features/org.eclipse.wst.sdk/.project
deleted file mode 100644
index 0d7c53e..0000000
--- a/assembly/features/org.eclipse.wst.sdk/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sdk</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/assembly/features/org.eclipse.wst.sdk/.settings/org.eclipse.core.resources.prefs b/assembly/features/org.eclipse.wst.sdk/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 668d02c..0000000
--- a/assembly/features/org.eclipse.wst.sdk/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 13 22:00:58 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/features/org.eclipse.wst.sdk/.settings/org.eclipse.pde.prefs b/assembly/features/org.eclipse.wst.sdk/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08865f1..0000000
--- a/assembly/features/org.eclipse.wst.sdk/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 15:42:26 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/assembly/features/org.eclipse.wst.sdk/build.properties b/assembly/features/org.eclipse.wst.sdk/build.properties
deleted file mode 100644
index 55dc007..0000000
--- a/assembly/features/org.eclipse.wst.sdk/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               eclipse_update_120.jpg,\
-               epl-v10.html
-               
diff --git a/assembly/features/org.eclipse.wst.sdk/eclipse_update_120.jpg b/assembly/features/org.eclipse.wst.sdk/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.wst.sdk/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.wst.sdk/epl-v10.html b/assembly/features/org.eclipse.wst.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.wst.sdk/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/assembly/features/org.eclipse.wst.sdk/feature.properties b/assembly/features/org.eclipse.wst.sdk/feature.properties
deleted file mode 100644
index 94efb4d..0000000
--- a/assembly/features/org.eclipse.wst.sdk/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Web Standard Tools (WST) Project SDK
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST project SDK
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.wst.sdk/feature.xml b/assembly/features/org.eclipse.wst.sdk/feature.xml
deleted file mode 100644
index c74e054..0000000
--- a/assembly/features/org.eclipse.wst.sdk/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.sdk"
-      label="%featureName"
-      version="1.5.2.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.wst"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.ws_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.rdb_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.doc.isv.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.wst.sdk/license.html b/assembly/features/org.eclipse.wst.sdk/license.html
deleted file mode 100644
index 2347060..0000000
--- a/assembly/features/org.eclipse.wst.sdk/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/assembly/features/org.eclipse.wst.tests.feature/.cvsignore b/assembly/features/org.eclipse.wst.tests.feature/.cvsignore
deleted file mode 100644
index 083c9d1..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.tests.feature_1.0.0.bin.dist.zip
-org.eclipse.wst.tests.feature_0.7.0.bin.dist.zip
diff --git a/assembly/features/org.eclipse.wst.tests.feature/.settings/org.eclipse.core.resources.prefs b/assembly/features/org.eclipse.wst.tests.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 668d02c..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 13 22:00:58 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/features/org.eclipse.wst.tests.feature/.settings/org.eclipse.pde.prefs b/assembly/features/org.eclipse.wst.tests.feature/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08865f1..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 15:42:26 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/assembly/features/org.eclipse.wst.tests.feature/build.properties b/assembly/features/org.eclipse.wst.tests.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/assembly/features/org.eclipse.wst.tests.feature/eclipse_update_120.jpg b/assembly/features/org.eclipse.wst.tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.wst.tests.feature/epl-v10.html b/assembly/features/org.eclipse.wst.tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.wst.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/assembly/features/org.eclipse.wst.tests.feature/feature.properties b/assembly/features/org.eclipse.wst.tests.feature/feature.properties
deleted file mode 100644
index 713e508..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Web Standard Tools (WST) Project Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST project tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.wst.tests.feature/feature.xml b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
deleted file mode 100644
index e654cd6..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.tests.feature"
-      label="%featureName"
-      version="1.5.1.qualifier"
-      provider-name="%providerName">
-   <install-handler/>
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.common_tests.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_tests.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_tests.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.rdb_tests.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_tests.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.ws_tests.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.wst.tests.feature/license.html b/assembly/features/org.eclipse.wst.tests.feature/license.html
deleted file mode 100644
index 2347060..0000000
--- a/assembly/features/org.eclipse.wst.tests.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.doc.isv.feature/.cvsignore b/assembly/features/org.eclipse.wtp.patch.assembly.feature/.cvsignore
similarity index 100%
rename from features/org.eclipse.jst.doc.isv.feature/.cvsignore
rename to assembly/features/org.eclipse.wtp.patch.assembly.feature/.cvsignore
diff --git a/assembly/features/org.eclipse.jst.tests/.project b/assembly/features/org.eclipse.wtp.patch.assembly.feature/.project
similarity index 86%
rename from assembly/features/org.eclipse.jst.tests/.project
rename to assembly/features/org.eclipse.wtp.patch.assembly.feature/.project
index 3bc7f5c..9f0930f 100644
--- a/assembly/features/org.eclipse.jst.tests/.project
+++ b/assembly/features/org.eclipse.wtp.patch.assembly.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.jst.tests</name>
+	<name>org.eclipse.wtp.patch.assembly.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/assembly/features/org.eclipse.wtp.patch.assembly.feature/build.properties b/assembly/features/org.eclipse.wtp.patch.assembly.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/assembly/features/org.eclipse.wtp.patch.assembly.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml b/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
new file mode 100644
index 0000000..ddcd92c
--- /dev/null
+++ b/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+    id="org.eclipse.wtp.patch.assembly.feature"
+    label="Patch Assembly Feature"
+    version="1.5.5.qualifier">
+
+    <includes
+        id="org.eclipse.wst.common_core.feature.patch"
+        version="0.0.0" />
+    <includes
+        id="org.eclipse.wst.server_core.feature.patch"
+        version="0.0.0" />
+
+    <includes
+        id="org.eclipse.wst.rdb_core.feature.patch"
+        version="0.0.0" />
+
+    <includes
+        id="org.eclipse.wst.rdb_ui.feature.patch"
+        version="0.0.0" />
+
+    <includes
+        id="org.eclipse.wst.xml_ui.feature.patch"
+        version="0.0.0" />
+
+    <includes
+        id="org.eclipse.wst.ws_ui.feature.patch"
+        version="0.0.0" />
+
+    <includes
+        id="org.eclipse.wst.web_core.feature.patch"
+        version="0.0.0" />
+
+    <includes
+        id="org.eclipse.jst.web_core.feature.patch"
+        version="0.0.0" />
+
+    <includes
+        id="org.eclipse.jst.enterprise_core.feature.patch"
+        version="0.0.0" />
+        
+    <includes
+        id="org.eclipse.jst.enterprise_ui.feature.patch"
+        version="0.0.0" />
+
+</feature>
diff --git a/assembly/features/org.eclipse.wst.tests.feature/.project b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/.project
similarity index 85%
rename from assembly/features/org.eclipse.wst.tests.feature/.project
rename to assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/.project
index 285a932..cd74446 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/.project
+++ b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.wst.tests.feature</name>
+	<name>org.eclipse.wtp.patch.tests.assembly.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/build.properties b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/feature.xml b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/feature.xml
new file mode 100644
index 0000000..920bb5c
--- /dev/null
+++ b/assembly/features/org.eclipse.wtp.patch.tests.assembly.feature/feature.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.wtp.patch.tests.assembly.feature"
+      label="Feature Feature"
+      version="1.5.5.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.eclipse.wtp.releng.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+         
+   <plugin
+         id="org.eclipse.wst.common.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.callisto.tools.versionchecker"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+
+
+</feature>
diff --git a/assembly/plugins/org.eclipse.wst/.cvsignore b/assembly/plugins/org.eclipse.wst/.cvsignore
deleted file mode 100644
index e4254b1..0000000
--- a/assembly/plugins/org.eclipse.wst/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-temp.folder
-build.xml
diff --git a/assembly/plugins/org.eclipse.wst/.settings/org.eclipse.core.resources.prefs b/assembly/plugins/org.eclipse.wst/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 668d02c..0000000
--- a/assembly/plugins/org.eclipse.wst/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 13 22:00:58 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/plugins/org.eclipse.wst/.settings/org.eclipse.pde.prefs b/assembly/plugins/org.eclipse.wst/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08865f1..0000000
--- a/assembly/plugins/org.eclipse.wst/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 15:42:26 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/assembly/plugins/org.eclipse.wst/META-INF/MANIFEST.MF b/assembly/plugins/org.eclipse.wst/META-INF/MANIFEST.MF
deleted file mode 100644
index e76e25f..0000000
--- a/assembly/plugins/org.eclipse.wst/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
diff --git a/assembly/plugins/org.eclipse.wst/about.html b/assembly/plugins/org.eclipse.wst/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/assembly/plugins/org.eclipse.wst/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/assembly/plugins/org.eclipse.wst/about.ini b/assembly/plugins/org.eclipse.wst/about.ini
deleted file mode 100644
index a21a3ec..0000000
--- a/assembly/plugins/org.eclipse.wst/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/assembly/plugins/org.eclipse.wst/about.mappings b/assembly/plugins/org.eclipse.wst/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/assembly/plugins/org.eclipse.wst/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.wst/about.properties b/assembly/plugins/org.eclipse.wst/about.properties
deleted file mode 100644
index 9626198..0000000
--- a/assembly/plugins/org.eclipse.wst/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Web Standard Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/assembly/plugins/org.eclipse.wst/build.properties b/assembly/plugins/org.eclipse.wst/build.properties
deleted file mode 100644
index 6f9f93d..0000000
--- a/assembly/plugins/org.eclipse.wst/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.gif,\
-               eclipse32.png,\
-               plugin.properties,\
-               plugin.xml
diff --git a/assembly/plugins/org.eclipse.wst/eclipse32.gif b/assembly/plugins/org.eclipse.wst/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/assembly/plugins/org.eclipse.wst/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.wst/eclipse32.png b/assembly/plugins/org.eclipse.wst/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/assembly/plugins/org.eclipse.wst/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.wst/plugin.properties b/assembly/plugins/org.eclipse.wst/plugin.properties
deleted file mode 100644
index 01116d6..0000000
--- a/assembly/plugins/org.eclipse.wst/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Web Standard Tools (WST)
-providerName = Eclipse.org
-
-# Activity names and descriptions
-activity.database        = Database Development
-activity.database.desc   = Create, update, delete, and view database information.
-activity.xml             = XML Development
-activity.xml.desc        = Develop XML applications.
-activity.web             = Web Development
-activity.web.desc        = Develop Web applications. 
-activity.webservice      = Web Service Development
-activity.webservice.desc = Develop Web service applications.
diff --git a/assembly/plugins/org.eclipse.wst/plugin.xml b/assembly/plugins/org.eclipse.wst/plugin.xml
deleted file mode 100644
index 6f02741..0000000
--- a/assembly/plugins/org.eclipse.wst/plugin.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-  
-   <!-- Database Capability Definition-->
-   <extension point="org.eclipse.ui.activities">
-       
-  		<activity
-            name="%activity.database"
-            description="%activity.database.desc"
-            id="org.eclipse.wst.database">
-     	</activity>
-     	
-     	<categoryActivityBinding
-            activityId="org.eclipse.wst.database"
-            categoryId="org.eclipse.categories.developmentCategory">
-      	</categoryActivityBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.database"
-            pattern="org\.eclipse\.wst\.rdb\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<defaultEnablement
-            id="org.eclipse.wst.database">
-      	</defaultEnablement>
-  </extension>
-  
-  <!-- XML Capability Definition-->
-  <!-- The following components are associated with
-       the XML activity as they are required by XML
-       and other components and XML is currently 
-       serving as the base WTP component.
-       common
-       sse
-       validation
-    -->
-  <extension point="org.eclipse.ui.activities">
-  	
-  		<activity
-            name="%activity.xml"
-            description="%activity.xml.desc"
-            id="org.eclipse.wst.xml">
-     	</activity>
-     	
-     	<categoryActivityBinding
-            activityId="org.eclipse.wst.xml"
-            categoryId="org.eclipse.categories.developmentCategory">
-      	</categoryActivityBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.xml\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.xsd\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.dtd\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.apache\.xerces\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.common\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.sse\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.validation\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.internet\.cache\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.xml"
-            pattern="org\.eclipse\.wst\.internet\.proxy\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<defaultEnablement
-            id="org.eclipse.wst.xml">
-      	</defaultEnablement>
-   </extension>
-   
-   <!-- Web Capability Definition-->
-   <!-- The Web capability requires the XML capability.
-      	The XML capability is currently serving as the
-      	default WTP capability. (See the comments on the
-      	XML capability.)
-    -->
-   <extension point="org.eclipse.ui.activities">
-      	
-  		<activity
-            name="%activity.web"
-            description="%activity.web.desc"
-            id="org.eclipse.wst.web">
-     	</activity>
-     	
-     	<categoryActivityBinding
-            activityId="org.eclipse.wst.web"
-            categoryId="org.eclipse.categories.developmentCategory">
-      	</categoryActivityBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.web"
-            pattern="org\.eclipse\.wst\.css\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.web"
-            pattern="org\.eclipse\.wst\.html\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.web"
-            pattern="org\.eclipse\.wst\.javascript\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.web"
-            pattern="org\.eclipse\.wst\.server\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.web"
-            pattern="org\.eclipse\.wst\.internet\.monitor\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.web"
-            pattern="org\.eclipse\.wst\.web\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityRequirementBinding 
-      		requiredActivityId="org.eclipse.wst.xml" 
-      		activityId="org.eclipse.wst.web">
-      	</activityRequirementBinding>
-      	
-      	<defaultEnablement
-            id="org.eclipse.wst.web">
-      	</defaultEnablement>
-      
-   </extension>
-   
-   <!-- Web Service Capability Definition-->
-   <!-- The Web Service capability requires the Web capability
-        and includes the command component.
-    -->
-   <extension point="org.eclipse.ui.activities">
-      	
-  		<activity
-            name="%activity.webservice"
-            description="%activity.webservice.desc"
-            id="org.eclipse.wst.webservice">
-     	</activity>
-     	
-     	<categoryActivityBinding
-            activityId="org.eclipse.wst.webservice"
-            categoryId="org.eclipse.categories.developmentCategory">
-      	</categoryActivityBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.eclipse\.wst\.ws\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.eclipse\.wst\.wsdl\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.eclipse\.wst\.wsi\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.apache\.axis\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.apache\.wsil4j\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.uddi4j\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.wsdl4j\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityPatternBinding
-            activityId="org.eclipse.wst.webservice"
-            pattern="org\.eclipse\.wst\.command\.[\.\w/]*">
-      	</activityPatternBinding>
-      	
-      	<activityRequirementBinding 
-      		requiredActivityId="org.eclipse.wst.web" 
-      		activityId="org.eclipse.wst.webservice">
-      	</activityRequirementBinding>
-      	
-      	<defaultEnablement
-            id="org.eclipse.wst.webservice">
-      	</defaultEnablement>
-      
-   </extension>
-</plugin>
diff --git a/docs/org.eclipse.jst.doc.isv/.project b/docs/org.eclipse.jst.doc.isv/.project
deleted file mode 100644
index f5955da..0000000
--- a/docs/org.eclipse.jst.doc.isv/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.doc.isv</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.doc.isv/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.jst.doc.isv/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6447921..0000000
--- a/docs/org.eclipse.jst.doc.isv/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 16 17:15:11 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.jst.doc.isv/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.jst.doc.isv/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 39b2454..0000000
--- a/docs/org.eclipse.jst.doc.isv/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Mon May 01 14:27:56 EDT 2006
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.jst.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100644
index 1c001ac..0000000
--- a/docs/org.eclipse.jst.doc.isv/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.doc.isv; singleton:=true
-Bundle-Version: 1.0.201.qualifier
-Bundle-Vendor: %providerName 
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Require-Bundle:  org.eclipse.help;bundle-version="[3.2.0,3.3.0)"
diff --git a/docs/org.eclipse.jst.doc.isv/about.html b/docs/org.eclipse.jst.doc.isv/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/docs/org.eclipse.jst.doc.isv/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.doc.isv/api-overview/overview.html b/docs/org.eclipse.jst.doc.isv/api-overview/overview.html
deleted file mode 100644
index 809840f..0000000
--- a/docs/org.eclipse.jst.doc.isv/api-overview/overview.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../apistyles.css" type="text/css">
-<title>JST API Overview</title>
-</head>
-<body>
-<P>
-			The J2EE Standard Tools (JST) subproject of the Web Tools
-			Platform (WTP) provides a framework for developing,
-			deploying, testing and debugging J2EE applications on
-			JCP-compliant server environments, as well as an exemplary
-			implementation of a plug-in for at least one JSR-88
-			compliant J2EE Server.
-		</P>
-<P>
-			The following components are available as part of the JST:
-			<ul>
-				
-<li>
-					
-<p>
-						Common (common): 
-					</p>
-				
-</li>
-				
-<li>
-					
-<p>Enterprise Java Beans (ejb):</p>
-				
-</li>
-				
-<li>
-					
-<p>J2EE (j2ee):</p>
-				
-</li>
-				
-<li>
-					
-<p>JavaServer Pages (jsp): Provides a SSE-based JSP source model and editor supporting embedded Java language scriptlets</p>
-				
-</li>
-				
-<li>
-					
-<p>Server (server):</p>
-				
-</li>
-				
-<li>
-					
-<p>Servlet (servlet):</p>
-				
-</li>
-				
-<li>
-					
-<p>Web Services (ws):</p>
-				
-</li>
-			
-</ul>
-		
-</P>
-</body>
-</html>
diff --git a/docs/org.eclipse.jst.doc.isv/api-overview/overview.xml b/docs/org.eclipse.jst.doc.isv/api-overview/overview.xml
deleted file mode 100644
index 9d8fa9c..0000000
--- a/docs/org.eclipse.jst.doc.isv/api-overview/overview.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta name="root" content=".." />
-		<title>JST API Overview</title>
-	</head>
-
-	<body>
-		<P>
-			The J2EE Standard Tools (JST) subproject of the Web Tools
-			Platform (WTP) provides a framework for developing,
-			deploying, testing and debugging J2EE applications on
-			JCP-compliant server environments, as well as an exemplary
-			implementation of a plug-in for at least one JSR-88
-			compliant J2EE Server.
-		</P>
-		<P>
-			The following components are available as part of the JST:
-			<ul>
-				<li>
-					<p>
-						Common (common): 
-					</p>
-				</li>
-				<li>
-					<p>Enterprise Java Beans (ejb):</p>
-				</li>
-				<li>
-					<p>J2EE (j2ee):</p>
-				</li>
-				<li>
-					<p>JavaServer Pages (jsp): Provides a SSE-based JSP source model and editor supporting embedded Java language scriptlets</p>
-				</li>
-				<li>
-					<p>Server (server):</p>
-				</li>
-				<li>
-					<p>Servlet (servlet):</p>
-				</li>
-				<li>
-					<p>Web Services (ws):</p>
-				</li>
-			</ul>
-		</P>
-	</body>
-</html>
diff --git a/docs/org.eclipse.jst.doc.isv/api-overview/overview/Idea.jpg b/docs/org.eclipse.jst.doc.isv/api-overview/overview/Idea.jpg
deleted file mode 100644
index 119ce70..0000000
--- a/docs/org.eclipse.jst.doc.isv/api-overview/overview/Idea.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/book.css b/docs/org.eclipse.jst.doc.isv/book.css
deleted file mode 100644
index a4eedda..0000000
--- a/docs/org.eclipse.jst.doc.isv/book.css
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/build.properties b/docs/org.eclipse.jst.doc.isv/build.properties
deleted file mode 100644
index 93fe21a..0000000
--- a/docs/org.eclipse.jst.doc.isv/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# use provided build.xml
-custom = true
diff --git a/docs/org.eclipse.jst.doc.isv/build.xml b/docs/org.eclipse.jst.doc.isv/build.xml
deleted file mode 100644
index 2f68956..0000000
--- a/docs/org.eclipse.jst.doc.isv/build.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.jst.doc.isv" default="build.jars" basedir=".">
-
-	<target name="init">
-		<property name="plugin" value="org.eclipse.jst.doc.isv"/>
-		<property name="version.suffix" value="1.0.201"/>
-		<property name="full.name" value="${plugin}_${version.suffix}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<property name="build.result.folder" value="${basedir}"/>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jst.doc.isv for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jst.doc.isv.">
-	</target>
-
-	<target name="build.sources" depends="init">
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<ant antfile="javadoc.xml" dir="${basedir}"/>
-		<ant antfile="buildExtDocs.xml" dir="${basedir}"/>
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<copy todir="${destination.temp.folder}/${full.name}">
-			<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_JST.xml,topics_Reference.xml,META-INF/,reference/,book.css,html/,notices.html,topics_ExtPoint_Reference.xml,javadoctoc.xml,schema.css"/>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}"/>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jst.doc.isv of all the zips, jars and logs created.">
-		<delete file="${plugin.destination}/${full.name}.jar"/>
-		<delete file="${plugin.destination}/${full.name}.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.jst.doc.isv.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
-		</delete>
-		<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>
diff --git a/docs/org.eclipse.jst.doc.isv/buildExtDocs.properties b/docs/org.eclipse.jst.doc.isv/buildExtDocs.properties
deleted file mode 100644
index 936d3bd..0000000
--- a/docs/org.eclipse.jst.doc.isv/buildExtDocs.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################
-# Information for extension point overview document
-################################################################
-# Overview document title
-title = WTP J2EE Standard Tools (WST) Extension Points
-header = JST Extension Points 
-# Introduction paragraph
-overview = The following extension points can be used to extend the capabilities of the JST infrastructure: 
-
-# A list of the extension points that should be included in the
-# extension point documentation.
-listed-ext-points=org.eclipse.jst.common.annotations.controller.annotationsController,\
-org.eclipse.jst.common.annotations.controller.annotationTagDynamicInitializer,\
-org.eclipse.jst.common.annotations.controller.AnnotationTagInfo,\
-org.eclipse.jst.common.annotations.controller.AnnotationTagSet,\
-org.eclipse.jst.j2ee.core.ejbModelExtender,\
-org.eclipse.jst.j2ee.core.jndiBindingsHelpers,\
-org.eclipse.jst.j2ee.DeployerExtension,\
-org.eclipse.jst.j2ee.EARModuleExtension,\
-org.eclipse.jst.j2ee.ejb.annotation.model.ejbGenerator,\
-org.eclipse.jst.j2ee.ejb.annotations.emitter.template,\
-org.eclipse.jst.j2ee.ejb.annotations.xdoclet.ejbDocletTaskProvider,\
-org.eclipse.jst.j2ee.ejb.annotations.xdoclet.webdocletTaskProvider,\
-org.eclipse.jst.j2ee.ejb.annotations.xdoclet.xdocletRuntime,\
-org.eclipse.jst.j2ee.ExtendedModuleImport,\
-org.eclipse.jst.j2ee.J2EEModulePostImport,\
-org.eclipse.jst.j2ee.resourceEnvRefType,\
-org.eclipse.jst.j2ee.resourceRefType,\
-org.eclipse.jst.j2ee.web.fileURL,\
-org.eclipse.jst.j2ee.WebServiceClientGenerator,\
-org.eclipse.jst.j2ee.WSDLServiceHelper,\
-org.eclipse.jst.server.core.runtimeClasspathProviders,\
-org.eclipse.jst.server.core.runtimeFacetMappings,\
-org.eclipse.jst.server.core.serverProfilers,\
-org.eclipse.jst.server.generic.core.genericpublisher,\
-org.eclipse.jst.server.generic.core.serverdefinition
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/buildExtDocs.xml b/docs/org.eclipse.jst.doc.isv/buildExtDocs.xml
deleted file mode 100644
index 7bcff6a..0000000
--- a/docs/org.eclipse.jst.doc.isv/buildExtDocs.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
-
-	<property file="buildExtDocs.properties"/>
-	<property name="outputDir" value="${basedir}${file.separator}reference${file.separator}extension-points"/>
-	<property name="entOutputDir" value="${outputDir}${file.separator}enterprise${file.separator}"/>
-	<property name="serverOutputDir" value="${outputDir}${file.separator}server${file.separator}"/>
-	<property name="webOutputDir" value="${outputDir}${file.separator}web${file.separator}"/>
-
-	<target name="createExtDocs" depends="buildExtDocs, createDocListings"/>
-	
-	<target name="buildExtDocs" depends="buildEntExtDocs, buildServerExtDocs, buildWebExtDocs"/>
-	
- 	<target name="buildEntExtDocs">
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee.core/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee.ejb.annotation.model/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee.ejb.annotations.emitter/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee.ejb.annotations.xdoclet/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee.webservice/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee.navigator.ui/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.ws.consumption/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.ws.consumption.ui/plugin.xml" destination="${entOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.ws.uddiregistry/plugin.xml" destination="${entOutputDir}" />
- 		
- 		<!-- Get the list of extension doc files. -->
- 		<fileset dir="${entOutputDir}" casesensitive="yes" id="ext-docs-list-ent">
- 			<include name="*.html"/>
- 		</fileset>
- 		 						
- 		<!-- Convert the list to an XML representation. -->
- 		<pathconvert property="ext-doc-ent" refid="ext-docs-list-ent" pathsep="&lt;/file&gt;&lt;file&gt;">
- 			<map from="${entOutputDir}" to=""/>
- 		</pathconvert>
- 		<echo file="entextdocs.xml">&lt;files component="enterprise"&gt;&lt;file&gt;${ext-doc-ent}&lt;/file&gt;&lt;/files&gt;</echo>
- 		 						
- 	</target>
-	
-	 	
-	<target name="buildServerExtDocs">
-	 	<pde.convertSchemaToHTML manifest="../org.eclipse.jst.server.core/plugin.xml" destination="${serverOutputDir}" />
-	 	<pde.convertSchemaToHTML manifest="../org.eclipse.jst.server.generic.core/plugin.xml" destination="${serverOutputDir}" />
-		
-		<!-- Get the list of extension doc files. -->
-		<fileset dir="${serverOutputDir}" casesensitive="yes" id="ext-docs-list-server">
-			<include name="*.html"/>
-		</fileset>
-								
-		<!-- Convert the list to an XML representation. -->
-		<pathconvert property="ext-doc-server" refid="ext-docs-list-server" pathsep="&lt;/file&gt;&lt;file&gt;">
-			<map from="${serverOutputDir}" to=""/>
-		</pathconvert>
-		<echo file="serverextdocs.xml">&lt;files component="server"&gt;&lt;file&gt;${ext-doc-server}&lt;/file&gt;&lt;/files&gt;</echo>
-						
-	</target>
-	
-	<target name="buildWebExtDocs">
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.common.annotations.controller/plugin.xml" destination="${webOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.j2ee.web/plugin.xml" destination="${webOutputDir}" />
-		
-		<!-- Get the list of extension doc files. -->
-		<fileset dir="${webOutputDir}" casesensitive="yes" id="ext-docs-list-web">
-			<include name="*.html"/>
-		</fileset>
-								
-		<!-- Convert the list to an XML representation. -->
-		<pathconvert property="ext-doc-web" refid="ext-docs-list-web" pathsep="&lt;/file&gt;&lt;file&gt;">
-			<map from="${webOutputDir}" to=""/>
-		</pathconvert>
-		<echo file="webextdocs.xml">&lt;files component="web"&gt;&lt;file&gt;${ext-doc-web}&lt;/file&gt;&lt;/files&gt;</echo>
-					
-	</target>
-	
-	<target name="createDocListings">
-		<!-- Create the overview document. -->
-		<xslt basedir="${basedir}" in="extDocListings.xml" out="${outputDir}${file.separator}index.html" style="extDocOverview.xsl">
-	  		<param name="title" expression="${title}"/>
-	  		<param name="header" expression="${header}"/>
-	  		<param name="overview" expression="${overview}"/>
-			<param name="listed-ext-points" expression="${listed-ext-points}"/>
-		</xslt>
-			
-		<!-- Create the extention point toc. -->
-		<xslt basedir="${basedir}" in="extDocListings.xml" out="topics_ExtPoint_Reference.xml" style="extDocToc.xsl">
-			<param name="listed-ext-points" expression="${listed-ext-points}"/>
-			<outputproperty name="method" value="xml"/>
-			<outputproperty name="indent" value="yes"/>
-		</xslt>
-			
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/extDocListings.xml b/docs/org.eclipse.jst.doc.isv/extDocListings.xml
deleted file mode 100644
index de7daad..0000000
--- a/docs/org.eclipse.jst.doc.isv/extDocListings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components>
-	<component name="Enterprise Java" id="enterprise" file="entextdocs.xml"/>
-	<component name="Server" id="server" file="serverextdocs.xml"/>
-	<component name="Web" id="web" file="webextdocs.xml"/>
-</components>
diff --git a/docs/org.eclipse.jst.doc.isv/extDocOverview.xsl b/docs/org.eclipse.jst.doc.isv/extDocOverview.xsl
deleted file mode 100644
index ffe0ef1..0000000
--- a/docs/org.eclipse.jst.doc.isv/extDocOverview.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt">
-    <xsl:param name="title"/>
-    <xsl:param name="header"/>
-    <xsl:param name="overview"/>
-    <xsl:param name="listed-ext-points"/>
-    
-    <xsl:template match="components">
-    	
-    	<xsl:text disable-output-escaping="yes">
-    	&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"&gt;
-		</xsl:text>
-		<html>
-		<head>
-		<xsl:text disable-output-escaping="yes">
-		&lt;meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." &gt;
-
-   		&lt;meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"&gt;
-   		</xsl:text>
-   		<title><xsl:value-of select="$title"/></title>
-   		<xsl:text disable-output-escaping="yes">
-		&lt;LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css"&gt;
-		</xsl:text>
-		</head>
-		<body link="#0000FF" vlink="#800080">
-
-		<center>
-		<h1><xsl:value-of select="$header"/></h1>
-		</center>
-
-		<xsl:value-of select="$overview"/>
-    	<xsl:for-each select="component">
-    		<xsl:sort select="@id"/>
-    		<h3><a name="{@id}"></a><xsl:value-of select="@name"/></h3>
-    		<ul>
-    			<xsl:for-each select="document(@file)/files/file">
-    				<xsl:sort select="text()"/>
-    				<xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
-  						<li>
-  							<a href="{../@component}/{text()}"><xsl:value-of select="translate(substring(text(), 0, string-length(text()) - 4),'_','.')"/></a> 
-  						</li>
-  					</xsl:if>
-    			</xsl:for-each>
-    		</ul>
-    	</xsl:for-each>
-    	</body>
-		</html>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.jst.doc.isv/extDocToc.xsl b/docs/org.eclipse.jst.doc.isv/extDocToc.xsl
deleted file mode 100644
index 30e54b8..0000000
--- a/docs/org.eclipse.jst.doc.isv/extDocToc.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt"
-    exclude-result-prefixes="xalan">
-    <xsl:param name="listed-ext-points"/>
-    
-     <xsl:template match="components">
-     	<xsl:text disable-output-escaping="yes">
-&lt;?NLS TYPE="org.eclipse.help.toc"?&gt;
-	 	</xsl:text>
-	 	<toc label="Extension Points Reference">
-	 		<xsl:for-each select="document(component/@file)/files/file">
-	 			<xsl:sort select="text()"/>
-	 			<xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
-	 				<topic label="{translate(substring(text(), 0, string-length(text()) - 4),'_','.')}" href="reference/extension-points/{../@component}/{text()}">
-	 				</topic>
-	 			</xsl:if>
-	 		</xsl:for-each>
-	 	</toc> 
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.jst.doc.isv/html/plugin_descriptions_JST/jst.html b/docs/org.eclipse.jst.doc.isv/html/plugin_descriptions_JST/jst.html
deleted file mode 100644
index 5d754af..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/plugin_descriptions_JST/jst.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta
-  http-equiv="Content-Type"
-  content="text/html; charset=iso-8859-1">
-
-<title>org.eclipse.wst.command.env.core</title>
-
-<link
-  rel="stylesheet"
-  type="text/css"
-  href="../sources/formate.css">
-</head>
-<body>
-<p class="ueberschrift">Project Context</p>
-<h2></h2>
-<p>The scope of the J2EE Standard Tools subproject is the support of
-J2EE programming. This includes the support of APIs covered by the
-J2EE1.4 specifications (e.g. JSP, Servlets, EJBs, JCA, JMS, JNDI, JDBC,
-Java Web Services, JAX* and related JSRs). Support for JCP
-specifications commonly used in Web Applications, but not included in
-J2EE1.4 is to be studied on a case by case basis (ex: JSF,JDO).</p>
-<p>Support of frameworks not covered by the JCP (ex: Struts, Hibernate,
-XMLC) is outside the scope of this project, such projects could find a
-home in the Eclipse Technology project.</p>
-<p>JST has annotation support (JSR 175-Metadata), on top of those
-provided in the JDT, e.g. for code assist, where applicable. Annotation
-support includes JSR 181-Metadata for Web Services, and in the future
-will include support for other standardized metadata such as EJBs. In
-the transitional period until there are JSRs for J2EE annotations, JST
-will have some support for widely accepted open technologies such as
-XDoclet.</p>
-<p class="ueberschrift">Project Architecture</p>
-<br>
-<p><img
-  src="../sources/jstsubsystems.jpg"
-  alt=""></p>
-</body>
-</html>
diff --git a/docs/org.eclipse.jst.doc.isv/html/sources/EJB_generation_datamodels.gif b/docs/org.eclipse.jst.doc.isv/html/sources/EJB_generation_datamodels.gif
deleted file mode 100644
index f88accc..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/sources/EJB_generation_datamodels.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/html/sources/formate.css b/docs/org.eclipse.jst.doc.isv/html/sources/formate.css
deleted file mode 100644
index c02625e..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/sources/formate.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* CSS Document */
-body {
-	font-family: Arial, Helvetica, sans-serif
-}
-
-.ueberschrift {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: x-large;
-	margin-top: 20px;
-}
-
-.code {
-	font-family: Courier, "Courier New", Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: normal;
-	line-height: 16px;
-	color: #0467B4;
-	background-color: #CCCCCC;
-	padding: 5px 7px 5px 13px;
-	border: 1px solid black;
-}
-
-.note {
-	font-size: smaller
-}
-
-.description {
-	font-family: "Times New Roman", Times, serif;
-	font-size: xx-large;
-}
-
-.schema {
-	font-style: italic;
-	font-size: large
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_1.jpg b/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_1.jpg
deleted file mode 100644
index 9c1aebc..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_12.jpg b/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_12.jpg
deleted file mode 100644
index f283d66..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_12.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_6.jpg b/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_6.jpg
deleted file mode 100644
index a4a750e..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_6.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_8.jpg b/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_8.jpg
deleted file mode 100644
index da653ce..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/sources/j2ee_8.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/html/sources/jstsubsystems.jpg b/docs/org.eclipse.jst.doc.isv/html/sources/jstsubsystems.jpg
deleted file mode 100644
index 6baf722..0000000
--- a/docs/org.eclipse.jst.doc.isv/html/sources/jstsubsystems.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.properties b/docs/org.eclipse.jst.doc.isv/javadoc.properties
deleted file mode 100644
index ec8d447..0000000
--- a/docs/org.eclipse.jst.doc.isv/javadoc.properties
+++ /dev/null
@@ -1,161 +0,0 @@
-eclipse.home=${osgi.install.area}
-
-plugin.basedir=.
-plugin.sourcefolders=../org.eclipse.jst.common.frameworks/src;\
-../org.eclipse.jst.common.annotations.controller/controller;\
-../org.eclipse.jst.common.annotations.ui/src;\
-../org.eclipse.jst.j2ee/j2eeplugin;\
-../org.eclipse.jst.j2ee/common;\
-../org.eclipse.jst.j2ee/commonedit;\
-../org.eclipse.jst.j2ee/earproject;\
-../org.eclipse.jst.j2ee/j2eecreation;\
-../org.eclipse.jst.j2ee/archiveops;\
-../org.eclipse.jst.j2ee/applicationedit;\
-../org.eclipse.jst.j2ee/appclientcreation;\
-../org.eclipse.jst.j2ee/refactor;\
-../org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator;\
-../org.eclipse.jst.j2ee.ui/j2ee_ui;\
-../org.eclipse.jst.j2ee.core/mofj2ee;\
-../org.eclipse.jst.j2ee.core/webservices;\
-../org.eclipse.jst.j2ee.core/commonArchive;\
-../org.eclipse.jst.j2ee.core/j2eeCorePlugin;\
-../org.eclipse.jst.j2ee.core/j2ee-validation;\
-../org.eclipse.jst.j2ee.ejb/ejb;\
-../org.eclipse.jst.j2ee.ejb/ejbedit;\
-../org.eclipse.jst.j2ee.ejb/ejbcreation;\
-../org.eclipse.jst.j2ee.ejb/ejbarchive;\
-../org.eclipse.jst.j2ee.ejb/ejbvalidator;\
-../org.eclipse.jst.j2ee.ejb.annotation.model/src;\
-../org.eclipse.jst.j2ee.ejb.annotations.emitter/src;\
-../org.eclipse.jst.j2ee.ejb.annotations.ui/src;\
-../org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src;\
-../org.eclipse.jst.ejb.ui/ejb_ui;\
-../org.eclipse.jst.j2ee.jca/jca;\
-../org.eclipse.jst.j2ee.jca/rarproject;\
-../org.eclipse.jst.j2ee.jca/jcaedit;\
-../org.eclipse.jst.j2ee.jca/jca-validation;\
-../org.eclipse.jst.j2ee.jca/property_files;\
-../org.eclipse.jst.j2ee.jca.ui/jca_ui;\
-../org.eclipse.jst.j2ee.web/web;\
-../org.eclipse.jst.j2ee.web/war-validation;\
-../org.eclipse.jst.j2ee.web/webedit;\
-../org.eclipse.jst.j2ee.web/webproject;\
-../org.eclipse.jst.j2ee.web/property_files;\
-../org.eclipse.jst.servlet.ui/servlet_ui;\
-../org.eclipse.jst.j2ee.webservice/webservice;\
-../org.eclipse.jst.j2ee.webservice.ui/webservices_ui;\
-../org.eclipse.jst.jsp.core/src;\
-../org.eclipse.jst.jsp.ui/src;\
-../org.eclipse.jst.server.core/sjavacore;\
-../org.eclipse.jst.server.ui/sjavaui;\
-../org.eclipse.jst.server.generic.core/src;\
-../org.eclipse.jst.server.generic.ui/src;\
-
-api.packages=org.eclipse.jst.j2ee.application,\
-org.eclipse.jst.j2ee.client,\
-org.eclipse.jst.j2ee.common,\
-org.eclipse.jst.j2ee.ejb,\
-org.eclipse.jst.j2ee.jca,\
-org.eclipse.jst.j2ee.jsp,\
-org.eclipse.jst.j2ee.webapplication,\
-org.eclipse.jst.j2ee.webservice.jaxrpcmap,\
-org.eclipse.jst.j2ee.webservice.wsclient,\
-org.eclipse.jst.j2ee.webservice.wscommon,\
-org.eclipse.jst.j2ee.webservice.wsdd,\
-org.eclipse.jst.jsp.core.taglib,\
-org.eclipse.jst.jsp.ui,\
-org.eclipse.jst.jsp.ui.views.contentoutline
-
-
-api.packages.old=org.eclipse.jst.j2ee.webservice.jaxrpcmap,\
-org.eclipse.jst.j2ee.webapplication,\
-org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl,\
-org.eclipse.jst.j2ee.webservice.wsdd,\
-org.eclipse.jst.j2ee.application,\
-org.eclipse.jst.j2ee.common,\
-org.eclipse.jst.j2ee.jca,\
-org.eclipse.jst.j2ee.ejb,\
-org.eclipse.jst.j2ee.webservice.wscommon,\
-org.eclipse.jst.j2ee.client,\
-org.eclipse.jst.j2ee.webservice.wsclient,\
-org.eclipse.jst.j2ee.webservice,\
-org.eclipse.jst.j2ee.jsp,\
-org.eclipse.jst.j2ee.webservice.jaxrpcmap.util,\
-org.eclipse.jst.jsp.core.taglib.ITaglibIndexListener,\
-org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP,\
-org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration
-
-api.title=Web Tools Platform: J2EE Standards Tools
-
-classpath=../org.eclipse.jst.j2ee/bin;\
-../org.eclipse.jst.ejb.ui/bin;\
-../org.eclipse.jst.jca.ui/bin;\
-../org.eclipse.jst.j2ee.ui/bin;\
-../org.eclipse.jst.j2ee.web/bin;\
-../org.eclipse.jst.servlet.ui/bin;\
-../org.eclipse.jst.server.core/bin;\
-${eclipse.home}/plugins/org.eclipse.ant.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ant.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.compare_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.core.boot_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.commands_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.expressions_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.filebuffers_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.resources_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.resources.win32_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.runtime_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.core.runtime.compatibility_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.variables_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.debug.core_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.debug.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.help_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.help.appserver_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.help.base_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.help.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.debug.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.launching_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jface_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jface.text_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ltk.core.refactoring_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ltk.ui.refactoring_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.osgi_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.osgi.services_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.osgi.util_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.pde_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.pde.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.pde.runtime_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.pde.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.rcp_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.search_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.swt_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.cvs.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.team.cvs.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.text_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.browser_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.cheatsheets_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.console_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.editors_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.externaltools_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.forms_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.ide_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.intro_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.views_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.win32_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.workbench_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.workbench.texteditor_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.update.configurator_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.update.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.update.core.win32_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.update.scheduler_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.update.ui_3.1.1.jar;
-
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xml b/docs/org.eclipse.jst.doc.isv/javadoc.xml
deleted file mode 100644
index cd4d220..0000000
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="main" basedir=".">
-
-	<property file="javadoc.properties" />
-	<property name="outputDir" value="${basedir}"/>
-
-	<target name="main" depends="prephtml, javadoc, packagetoc" description="Builds Plugin Javadoc" />
-
-	<target name="prephtml" description="Transforms XML to HTML.">	
-		<xslt 	style="javadoc.xsl" 
-				destdir=".." 
-				basedir=".."	
-				includes="**/overview.xml,**/package.xml" 
-				excludes="**/build/*,**/@dot/**"
-		/>  
-	</target>
-
-    <target name="javadoc">
-<echo message="========= ${eclipse.home}"/>
-		<mkdir dir="${outputDir}/reference/api/overview" />
-
-		<copy todir="${outputDir}/reference/api/overview" flatten="true" >
-			<fileset dir="${basedir}/api-overview/overview/"/> 
-			<fileset dir="${basedir}/.." includes="*/javadoc-images/*.jpg"/> 
-		</copy>
-        <javadoc
-        	access="public" 
-			author="false" 
-			classpath="${classpath}" 
-			destdir="${outputDir}/reference/api" 
-			doctitle="${api.title}" 
-			nodeprecated="false" 
-			nodeprecatedlist="false" 
-			noindex="false" 
-			nonavbar="false" 
-			notree="false" 
-			overview="${basedir}/api-overview/overview.html"
-			packagenames="${api.packages}" 
-			sourcepath="${plugin.sourcefolders}" 
-			splitindex="true" 
-			use="true" 
-			version="true"
-			breakiterator="yes"
-        	verbose="false"
-        	failonerror="false"
-			/> 
-    </target> 
-	
-	<target name="packagetoc">
-			<loadfile
-			      property="wtp.packages"
-			      srcFile="${outputDir}/reference/api/package-list">
-				  <filterchain>
-				  	<filterreader classname="org.apache.tools.ant.filters.PrefixLines">
-				  	  <param name="prefix" value="&lt;/package&gt;&lt;package&gt;"/>
-				  	</filterreader>
-				  	<striplinebreaks/>
-				 </filterchain>
-			</loadfile>
-			
-			<!-- Create packages.xml file -->
-			<echo file="packages.xml">&lt;packages&gt;&lt;package&gt;${wtp.packages}&lt;/package&gt;&lt;/packages&gt;</echo>
-			
-			<xslt basedir="${basedir}" in="packages.xml" out="javadoctoc.xml" style="javadocToc.xsl">
-				<outputproperty name="method" value="xml"/>
-				<outputproperty name="indent" value="yes"/>
-			</xslt>
-		</target>
-</project>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xsl b/docs/org.eclipse.jst.doc.isv/javadoc.xsl
deleted file mode 100644
index 5b824e5..0000000
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xsl
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	version="1.0">
-
-	<xsl:variable name="root">
-		<xsl:choose>
-			<xsl:when test="/html/head/meta[@name='root']/@content">
-				<xsl:value-of select="/html/head/meta[@name='root']/@content" />
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:text>../..</xsl:text>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-
-	<xsl:template match="/">
-		<xsl:apply-templates />
-	</xsl:template>
-
-	<xsl:template match="html">
-		<html>
-			<head>
-				<meta
-					content="text/html; charset=iso-8859-1"
-					http-equiv="Content-Type" />
-				<link
-					type="text/css"
-					href="{$root}/apistyles.css"
-					rel="stylesheet" />
-				<xsl:apply-templates select="head/title" />
-			</head>
-			<body> 
-				<xsl:apply-templates
-					select="body/*"
-					mode="body" />
-			</body>
-		</html>
-	</xsl:template>
-
-	<xsl:template
-		match="h1"
-		mode="banner">
-		<table
-			border="0"
-			cellpadding="2"
-			cellspacing="5"
-			width="100%">
-			<tbody>
-				<tr>
-					<td
-						align="left"
-						width="60%">
-						<font class="indextop">
-							<xsl:value-of select="." />
-						</font>
-						<br />
-						<font class="indexsub">
-							<xsl:value-of select="/html/head/title" />
-						</font>
-					</td>
-					<td width="40%">
-						<img
-							src="{$root}/overview/Idea.jpg"
-							align="middle"
-							height="86"
-							hspace="50"
-							width="120" />
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</xsl:template>
-
-	<xsl:template
-		match="h1"
-		mode="body" />
-
-	<xsl:template
-		match="h2"
-		mode="body">
-
-		<table
-			border="0"
-			cellpadding="2"
-			cellspacing="5"
-			width="100%">
-			<tbody>
-				<tr>
-					<td
-						colspan="2"
-						align="left"
-						bgcolor="#0080c0"
-						valign="top">
-						<b>
-							<font
-								color="#ffffff"
-								face="Arial,Helvetica">
-								<xsl:apply-templates />
-							</font>
-						</b>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</xsl:template>
-
-	<xsl:template
-		match="h3"
-		mode="body">
-		<img
-			src="{$root}/images/Adarrow.gif"
-			border="0"
-			height="16"
-			width="16" />
-		<xsl:apply-templates />
-	</xsl:template>
-
-	<xsl:template
-		match="*"
-		mode="body">
-
-		<xsl:copy>
-			<xsl:apply-templates select="*|@*|text()" />
-		</xsl:copy>
-	</xsl:template>
-
-	<xsl:template match="*|@*|text()">
-		<xsl:copy>
-			<xsl:apply-templates select="*|@*|text()" />
-		</xsl:copy>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.jst.doc.isv/javadocToc.xsl b/docs/org.eclipse.jst.doc.isv/javadocToc.xsl
deleted file mode 100644
index ad71795..0000000
--- a/docs/org.eclipse.jst.doc.isv/javadocToc.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt"
-    exclude-result-prefixes="xalan">
-    
-     <xsl:template match="packages">
-     <xsl:text disable-output-escaping="yes">
-&lt;?NLS TYPE="org.eclipse.help.toc"?&gt;
-	 </xsl:text>
-	 <toc label="Javadoc Packages Reference">
-	 <xsl:for-each select="package">
-	 <xsl:sort select="text()"/>
-	 	<xsl:if test="text() != ''">
-	 		<topic label="{text()}" href="reference/api/{translate(text(),'.','/')}/package-summary.html"/>
-	 	</xsl:if>
-	 </xsl:for-each>
-	
-	 </toc> 
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.jst.doc.isv/notices.html b/docs/org.eclipse.jst.doc.isv/notices.html
deleted file mode 100644
index e0cf4d1..0000000
--- a/docs/org.eclipse.jst.doc.isv/notices.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1"
-	TYPE="text/css">
-<title>Legal Notices</title>
-</head>
-<body>
-
-<h3><a NAME="Notices"></a>Notices</h3>
-<p>The material in this guide is Copyright (c) IBM Corporation and
-others 2000, 2005.</p>
-<p><a href="about.html">Terms and conditions regarding the use of this
-guide.</a></p>
-</body>
-</html>
diff --git a/docs/org.eclipse.jst.doc.isv/plugin.properties b/docs/org.eclipse.jst.doc.isv/plugin.properties
deleted file mode 100644
index b78a484..0000000
--- a/docs/org.eclipse.jst.doc.isv/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
-pluginName=JST ISV Documentation
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/plugin.xml b/docs/org.eclipse.jst.doc.isv/plugin.xml
deleted file mode 100644
index aceeb4f..0000000
--- a/docs/org.eclipse.jst.doc.isv/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-<!--
- =============================================================================  
-	Small library containing a live help action used in doc  
- ============================================================================= 
--->
-<!-- Left from org.eclipse.platform.isv.doc
-	 -->
- 
-	
-<!--
- ============================================================================= 
-	Define Primary Table of Contents             
- ============================================================================= 
---> 
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml" primary="true">
-		</toc>
-	</extension>
-
-<!--
- =============================================================================  
- Define Subsection Table of Contents
- ============================================================================= 
---> 
-	<extension point="org.eclipse.help.toc">
-		<toc file="topics_Reference.xml"/>
-		<!--
-		<toc file="toc_JST.xml"/>
-		-->
-		<!-- The following toc is generated by the build. -->
-		<toc file="topics_ExtPoint_Reference.xml"/>
-		<!-- The following toc is generated by the build. -->
-		<toc file="javadoctoc.xml"/>
-	</extension>
-</plugin>
diff --git a/docs/org.eclipse.jst.doc.isv/reference/book.css b/docs/org.eclipse.jst.doc.isv/reference/book.css
deleted file mode 100644
index a4eedda..0000000
--- a/docs/org.eclipse.jst.doc.isv/reference/book.css
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.doc.isv/reference/schema.css b/docs/org.eclipse.jst.doc.isv/reference/schema.css
deleted file mode 100644
index 00f9d01..0000000
--- a/docs/org.eclipse.jst.doc.isv/reference/schema.css
+++ /dev/null
@@ -1,66 +0,0 @@
-H6.CaptionFigColumn#header {
-	font-size:16px; 
-	display:inline
-}
-
-P.Note#copyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#dtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-P.Code#dtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
-}
-
-P.Code#tag {
-	color: #000080; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#cstring {
-	color: #008000; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;	
-}
-
-.ConfigMarkup#elementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-.ConfigMarkup#attlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
-}
-
diff --git a/docs/org.eclipse.jst.doc.isv/schema.css b/docs/org.eclipse.jst.doc.isv/schema.css
deleted file mode 100644
index 00f9d01..0000000
--- a/docs/org.eclipse.jst.doc.isv/schema.css
+++ /dev/null
@@ -1,66 +0,0 @@
-H6.CaptionFigColumn#header {
-	font-size:16px; 
-	display:inline
-}
-
-P.Note#copyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#dtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-P.Code#dtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
-}
-
-P.Code#tag {
-	color: #000080; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#cstring {
-	color: #008000; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;	
-}
-
-.ConfigMarkup#elementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-.ConfigMarkup#attlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
-}
-
diff --git a/docs/org.eclipse.jst.doc.isv/template-package.xml b/docs/org.eclipse.jst.doc.isv/template-package.xml
deleted file mode 100644
index eeed5ad..0000000
--- a/docs/org.eclipse.jst.doc.isv/template-package.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<!--  This file should be renamed to "package.xml" and placed within the API 
-			package that you're summarizing.
-	 -->
-	<head>
-		<!--  Escape to the root of your source folder  -->
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>title</title>
-	</head>
-
-	<body>
-		<p>
-			An overview sentence for the overview-summary page -- one sentence only.
-		</p>
-		<table width="500">
-			<tr>
-				<td>
-					<p>Insert text within this table template. The width is fixed
-						to prevent large images from stretching the text across
-						the entire screen.
-					</p>
-				</td>
-			</tr>
-		</table>
-	<!--  
-		REMOVE THIS COMMENT OR THE XSLT StyleSheet WILL FAIL!
-
-		The following template should be used for images. You must escape out 
-		to the root directory of your packages, include the path "overview" and
-		then the name of your image. All images should be JPEG (*.jpg -- case is 
-		important). The actual images should be located under [plugin]/javadoc-images. 
-		If javadoc-images does not exist in your plugin, create one and update
-		org.eclipse.wst.doc.isv/javadoc.xml to copy the *.jpg into the correct
-		location. The "overview" directory must be in the link as below since
-		the *.jpg files from [plugin]/javadoc-images to [doc]/overview. 
-
-	-->
-		<table
-			cellspacing="10"
-			cellpadding="10">
-			<tr>
-				<td>
-					<p>
-						<img
-							src="[escape out to source folder level]/overview/[your image].jpg" />
-					</p>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<p>
-						<i>Figure 1: The Module Structural Metamodel API</i>
-					</p>
-				</td>
-			</tr>
-		</table>
-	 -->
-	</body>
-</html>
diff --git a/docs/org.eclipse.jst.doc.isv/toc.xml b/docs/org.eclipse.jst.doc.isv/toc.xml
deleted file mode 100644
index c5abf46..0000000
--- a/docs/org.eclipse.jst.doc.isv/toc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- Define the top level topics                                                   -->
-<!-- ============================================================================= -->
-
-<toc label="J2EE Standard Tools Developer Guide">
-	<topic label="Programmer's Guide" href="html/plugin_descriptions_JST/jst.html">
-		<link toc="toc_JST.xml" />
-	</topic>
-	<topic label="Reference">
-		<link toc="topics_Reference.xml" />
-	</topic>
-	<topic label="Legal" href="notices.html" />
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/toc_JST.xml b/docs/org.eclipse.jst.doc.isv/toc_JST.xml
deleted file mode 100644
index 3c57f0c..0000000
--- a/docs/org.eclipse.jst.doc.isv/toc_JST.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Programmer's Guide" href="html/plugin_descriptions_JST/jst.html">
-	<topic label="Assembly Tools"
-		href="html/plugin_descriptions_WST/assembly.html">
-		<topic label="org.eclipse.wst"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.html" />
-	</topic>
-	<topic label="Command/Common Tools"
-		href="html/plugin_descriptions_WST/common_command.html">
-		<topic label="org.eclipse.wst.command.env"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.command.env.html" />
-		<topic label="org.eclipse.wst.command.env.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.command.env.core.html" />
-		<topic label="org.eclipse.wst.command.env.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.command.env.ui.html" />
-		<topic label="org.eclipse.wst.common.dependencychecker"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.dependencychecker.html" />
-		<topic label="org.eclipse.wst.common.emf"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.emf.html" />
-		<topic label="org.eclipse.wst.common.emfworkbench.integration"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.emfworkbench.integration.html" />
-		<topic label="org.eclipse.wst.common.frameworks"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.frameworks.html" />
-		<topic label="org.eclipse.wst.common.frameworks.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.frameworks.ui.html" />
-		<topic label="org.eclipse.wst.common.migration"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.migration.html" />
-		<topic label="org.eclipse.wst.common.migration.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.migration.ui.html" />
-		<topic label="org.eclipse.wst.common.modulecore"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.modulecore.html" />
-		<topic label="org.eclipse.wst.common.navigator"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.navigator.html" />
-		<topic label="org.eclipse.wst.common.navigator.views"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.navigator.views.html" />
-		<topic label="org.eclipse.wst.common.navigator.workbench"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.navigator.workbench.html" />
-		<topic label="org.eclipse.wst.common.snippets"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.snippets.html" />
-		<topic label="org.eclipse.wst.common.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.ui.html" />
-		<topic label="org.eclipse.wst.common.ui.properties"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.ui.properties.html" />
-		<topic label="org.eclipse.wst.common.uriresolver"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.common.uriresolver.html" />
-	</topic>
-	<topic label="Cascading Style Sheets (CSS) Tools"
-		href="html/plugin_descriptions_WST/css.html">
-		<topic label="org.eclipse.wst.css.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.css.core.html" />
-		<topic label="org.eclipse.wst.css.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.css.ui.html" />
-	</topic>
-	<topic label="Document Type Definition (DTD) Tools"
-		href="html/plugin_descriptions_WST/dtd.html">
-		<topic label="org.eclipse.wst.dtd.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.dtd.core.html" />
-		<topic label="org.eclipse.wst.dtd.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.dtd.ui.html" />
-	</topic>
-	<topic label="HTML Tools"
-		href="html/plugin_descriptions_WST/html.html">
-		<topic label="org.eclipse.wst.html.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.html.core.html" />
-		<topic label="org.eclipse.wst.html.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.html.ui.html" />
-	</topic>
-	<topic label="Internet Tools"
-		href="html/plugin_descriptions_WST/internet.html">
-		<topic label="org.eclipse.wst.internet.cache"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.internet.cache.html" />
-		<topic label="org.eclipse.wst.internet.monitor.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.internet.monitor.core.html" />
-		<topic label="org.eclipse.wst.internet.monitor.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.internet.monitor.ui.html" />
-		<topic label="org.eclipse.wst.internet.proxy"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.internet.proxy.html" />
-	</topic>
-	<topic label="Javascript Tools"
-		href="html/plugin_descriptions_WST/js.html">
-		<topic label="org.eclipse.wst.javascript.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.javascript.core.html" />
-		<topic label="org.eclipse.wst.javascript.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.javascript.ui.html" />
-	</topic>
-	<topic label="Relational Database (RDB) Tools"
-		href="html/plugin_descriptions_WST/rdb.html">
-		<topic label="org.eclipse.wst.rdb.connection.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.connection.ui.html" />
-		<topic label="org.eclipse.wst.rdb.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.core.html" />
-		<topic label="org.eclipse.wst.rdb.core.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.core.ui.html" />
-		<topic label="org.eclipse.wst.rdb.data.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.data.core.html" />
-		<topic label="org.eclipse.wst.rdb.data.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.data.ui.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.db2.cloudscape"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.db2.cloudscape.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.db2.iseries"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.db2.iseries.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.db2.luw"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.db2.luw.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.db2.series"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.db2.series.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.derby"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.derby.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.informix"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.informix.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.mysql"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.mysql.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.oracle"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.oracle.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.sqlserver"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.sqlserver.html" />
-		<topic label="org.eclipse.wst.rdb.dbdefinition.sybase"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.dbdefinition.sybase.html" />
-		<topic label="org.eclipse.wst.rdb.derby"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.derby.html" />
-		<topic label="org.eclipse.wst.rdb.derby.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.derby.ui.html" />
-		<topic label="org.eclipse.wst.rdb.fe.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.fe.ui.html" />
-		<topic label="org.eclipse.wst.rdb.fe.ui.actions"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.fe.ui.actions.html" />
-		<topic label="org.eclipse.wst.rdb.models.dbdefinition"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.models.dbdefinition.html" />
-		<topic label="org.eclipse.wst.rdb.models.sql"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.models.sql.html" />
-		<topic label="org.eclipse.wst.rdb.models.sql.edit"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.models.sql.edit.html" />
-		<topic label="org.eclipse.wst.rdb.mysql"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.mysql.html" />
-		<topic label="org.eclipse.wst.rdb.outputview"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.outputview.html" />
-		<topic label="org.eclipse.wst.rdb.server.extensions"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.server.extensions.html" />
-		<topic label="org.eclipse.wst.rdb.server.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.server.ui.html" />
-		<topic label="org.eclipse.wst.rdb.sqleditor"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.sqleditor.html" />
-		<topic label="org.eclipse.wst.rdb.sqlscrapbook"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.sqlscrapbook.html" />
-	</topic>
-	<topic label="Server Tools"
-		href="html/plugin_descriptions_wst/server.html">
-		<topic label="org.eclipse.wst.server.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.server.core.html" />
-		<topic label="org.eclipse.wst.server.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.server.ui.html" />
-		<topic label="org.eclipse.wst.server.util"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.server.util.html" />
-	</topic>
-	<topic label="Structured Source Editor (SSE) Tools"
-		href="html/plugin_descriptions_WST/sse.html">
-		<topic label="org.eclipse.wst.sse.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.sse.core.html" />
-		<topic label="org.eclipse.wst.sse.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.sse.ui.html" />
-	</topic>
-	<topic label="Validation Tools"
-		href="html/plugin_descriptions_WST/validation.html">
-		<topic label="org.eclipse.wst.validation"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.validation.html" />
-		<topic label="org.eclipse.wst.validation.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.validation.ui.html" />
-	</topic>
-	<topic label="Web Tools"
-		href="html/plugin_descriptions_WST/web.html">
-		<topic label="org.eclipse.wst.web"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.web.html" />
-		<topic label="org.eclipse.wst.web.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.web.ui.html" />
-	</topic>
-	<topic label="Web Services (WS), WSDL and WS-I Tools"
-		href="html/plugin_descriptions_WST/ws.html">
-		<topic label="org.eclipse.wst.ws"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.ws.html" />
-		<topic label="org.eclipse.wst.ws.explorer"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.ws.explorer.html" />
-		<topic label="org.eclipse.wst.ws.parser"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.ws.parser.html" />
-		<topic label="org.eclipse.wst.ws.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.ws.ui.html" />
-		<topic label="org.eclipse.wst.wsdl"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.wsdl.html" />
-		<topic label="org.eclipse.wst.wsdl.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.wsdl.ui.html" />
-		<topic label="org.eclipse.wst.wsdl.validation"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.wsdl.validation.html" />
-		<topic label="org.eclipse.wst.wsi"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.wsi.html" />
-		<topic label="org.eclipse.wst.wsi.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.wsi.ui.html" />
-	</topic>
-	<topic label="XML Tools &amp; XML Schema Definition (XSD) Tools"
-		href="html/plugin_descriptions_WST/xml.html">
-		<topic label="org.eclipse.wst.xml.catalog"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xml.catalog.html" />
-		<topic label="org.eclipse.wst.xml.catalog.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xml.catalog.ui.html" />
-		<topic label="org.eclipse.wst.xml.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xml.core.html" />
-		<topic label="org.eclipse.wst.xml.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xml.ui.html" />
-		<topic label="org.eclipse.wst.xml.uriresolver"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xml.uriresolver.html" />
-		<topic label="org.eclipse.wst.xml.uriresolver.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xml.uriresolver.ui.html" />
-		<topic label="org.eclipse.wst.xsd.contentmodel"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xsd.contentmodel.html" />
-		<topic label="org.eclipse.wst.xsd.core"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xsd.core.html" />
-		<topic label="org.eclipse.wst.xsd.ui"
-			href="html/plugin_descriptions_WST/org.eclipse.wst.xsd.ui.html" />
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/topics_Reference.xml b/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
deleted file mode 100644
index 535b94d..0000000
--- a/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- Define topics for the references                                              -->
-<!-- ============================================================================= -->
-<toc label="Reference">
-	<topic label="API Reference" href="reference/api/overview-summary.html">
-		<!-- The javadoctoc.xml toc is generated by the build. -->
-		<link toc="javadoctoc.xml" />
-	</topic>
-	
-	<topic label="Extension Points Reference" href="reference/extension-points/index.html">
-	    <!-- The topics_ExtPoints-Reference.xml toc is generated by the build. -->
-		<link toc="topics_ExtPoint_Reference.xml" />
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.isv/.project b/docs/org.eclipse.wst.doc.isv/.project
deleted file mode 100644
index 6c66e41..0000000
--- a/docs/org.eclipse.wst.doc.isv/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.doc.isv</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100644
index a07bf1b..0000000
--- a/docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName 
-Bundle-SymbolicName: org.eclipse.wst.doc.isv; singleton:=true
-Bundle-Version: 1.0.202.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,3.3.0)"
diff --git a/docs/org.eclipse.wst.doc.isv/README_HOWTO_pacakge_overview.txt b/docs/org.eclipse.wst.doc.isv/README_HOWTO_pacakge_overview.txt
deleted file mode 100644
index 7d86004..0000000
--- a/docs/org.eclipse.wst.doc.isv/README_HOWTO_pacakge_overview.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-Each API package is required to have a package overview document describing
-at a high level the problem solved by the API, how the API is meant to be used, 
-and where applicable diagrams and images explaining the expected and correct 
-usage. 
-
-Like the design of the WTP website, the package overviews are stored as 
-XML files within the root of the package that they describe. The file
-name must always be "package.xml". The XSLT stylesheet that runs as part 
-of the Javadoc process will transform this file into a "package.html" file,
-which is expected by the javadoc tool. 
-
-Developers have four tags to be aware of, in addition to the normal
-tag redefinitions that occur for the website (e.g. some header tags 
-are redefined as white text with light blue backgrounds that span 
-the page, like the Eclipse style). These four tags are:
-
-<p> tag: Each paragraph tag will be wrapped in a table that forces 
-a fixed width for the text lines. Overviews that choose to add images 
-can often stretch the text out into a width that is difficult or at a 
-minimum inconvenient to read. Each <p> tag will be formatted consistently
-across all overview documents. Please refrain from adding extra formatting
-around paragraph tags.
-
-<img src="" caption=""> tag: Each image will be displayed in a specialized table format, with
-a caption. The <img> tag has an attribute "caption" that will be displayed
-just under the image explaining in text what the picture intends to
-convey graphically. For example:
-
-<img src=".." caption="This sample text" />
-
-__________
-|         |
-|  img    |
-|_________|
-|__text___|
-
-*Also note that all images used in a package overview must be placed in the 
-root of the project under a directory named "javadoc-images". Whenever an
-image is linked to, the link must escape to the root package level
-to reference the image, and include "overview" in the path. So if you want to 
-link "model_overview.jpg" into package overview for "com.acme.model":
-
-(1) Place "model_overview.jpg" in <project>\javadoc-images
-(2) Add the following element to your document: 
-	<img src="../../../overview/model_overview.jpg" caption="An overview of the Acme Model API" />  
-	--> Note that the three "../" escapes is the same number of elements in the 
-		package path: com/acme/model/. 
-	--> "overview/" is required as all images will be pushed into the "overview" 
-		directory in the final javadoc layout. 
-
-		
-<codesnippet caption=""> tag: The codesnippet is provided to allow quick addition of code 
-snippet examples or usage patterns for API. The content of the <codesnippet />
-tag should be the actual source code. The tag will use the text exactly as it 
-appears in an HTML <pre> tag, and will wrap the snippet in a table for formatting.
-The codesnippet tag allows for a caption just as the img tag does. 
-
-<abstract> tag: The abstract tag should always occur first in your content, and should 
-contain a brief synopsis of your package overview ("package overview overview"). The 
-contents of this tag will be displayed in the full API overview page beside the linked
-package name. The tag should contain no extra HTML formatting.
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.isv/about.html b/docs/org.eclipse.wst.doc.isv/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/docs/org.eclipse.wst.doc.isv/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/api-overview/overview.html b/docs/org.eclipse.wst.doc.isv/api-overview/overview.html
deleted file mode 100644
index 7efb141..0000000
--- a/docs/org.eclipse.wst.doc.isv/api-overview/overview.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../apistyles.css" type="text/css">
-<title>wst api overview</title>
-</head>
-<body>
-<P>
-			The Web Standards Tools (WST) subproject of the Web Tools Platform
-			(WTP) provides some of the coolest tooling for open source enterprise
-			development since cheese in a can!
-		</P>
-<P>
-			The following components are available as part of the WST:
-			<ul>
-				
-<li>
-					
-<p>Command (command):</p>
-				
-</li>
-				
-<li>
-					
-<p>
-						Common (common): Provides frameworks that are not tied to a
-						specific Web Standard, but that are useful for many other
-						components within WST and the Java Standards Tools (JST)
-					</p>
-				
-</li>
-				
-<li>
-					
-<p>CSS (css):</p>
-				
-</li>
-				
-<li>
-					
-<p>DTD (dtd):</p>
-				
-</li>
-				
-<li>
-					
-<p>HTML (html):</p>
-				
-</li>
-				
-<li>
-					
-<p>Internet (internet):</p>
-				
-</li>
-				
-<li>
-					
-<p>Javascript (javascript):</p>
-				
-</li>
-				
-<li>
-					
-<p>Relational Databases (rdb):</p>
-				
-</li>
-				
-<li>
-					
-<p>Server (server):</p>
-				
-</li>
-				
-<li>
-					
-<p>SSE (sse):</p>
-				
-</li>
-				
-<li>
-					
-<p>Validation (validation):</p>
-				
-</li>
-				
-<li>
-					
-<p>
-						Web (web): Provides functionality for simple (non-J2EE) web
-						projects.
-					</p>
-				
-</li>
-				
-<li>
-					
-<p>Web Services (ws):</p>
-				
-</li>
-				
-<li>
-					
-<p>Web Services Definition Language (wsdl):</p>
-				
-</li>
-				
-<li>
-					
-<p>Web Services I(?) (wsi):</p>
-				
-</li>
-				
-<li>
-					
-<p>eXtensible Modeling Language (xml):</p>
-				
-</li>
-				
-<li>
-					
-<p>eXtensible Schema Definitions (xsd):</p>
-				
-</li>
-			
-</ul>
-		
-</P>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/api-overview/overview.xml b/docs/org.eclipse.wst.doc.isv/api-overview/overview.xml
deleted file mode 100644
index b19fb58..0000000
--- a/docs/org.eclipse.wst.doc.isv/api-overview/overview.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta name="root" content=".." />
-		<title>WST API Overview</title>
-	</head>
-
-	<body>
-		<P>
-			The Web Standard Tools (WST) subproject of the Web Tools
-			Platform (WTP) provides extensible tools for the development
-			of Web Applications and supports development, testing and
-			debugging with various servers using open standards,
-			specifications, and languages.
-		</P>
-		<P>
-			The following components are available as part of the WST:
-			<ul>
-				<li>
-					<p>Command (command):</p>
-				</li>
-				<li>
-					<p>
-						Common (common): Provides frameworks that are
-						not tied to a specific Web Standard, but that
-						are useful for many other components within WST
-						and the J2EE Standard Tools (JST)
-					</p>
-				</li>
-				<li>
-					<p>
-						CSS (css): Provides a SSE-based source model and
-						editor for Cascading Style Sheets
-					</p>
-				</li>
-				<li>
-					<p>
-						DTD (dtd): Provides a SSE-based DTD source model
-						and editor, as well as an EMF-based model and a
-						DTD validator
-					</p>
-				</li>
-				<li>
-					<p>
-						HTML (html): Provides a SSE-based HTML source
-						model, editor, and validator
-					</p>
-				</li>
-				<li>
-					<p>Internet (internet):</p>
-				</li>
-				<li>
-					<p>
-						Javascript (javascript): Provides a Javascript
-						source editor and source editor with preview
-					</p>
-				</li>
-				<li>
-					<p>Relational Databases (rdb):</p>
-				</li>
-				<li>
-					<p>Server (server):</p>
-				</li>
-				<li>
-					<p>
-						SSE (sse): Provides frameworks for extendable
-						and easiy embeddable source editing, with
-						emphasis on content-type-based behavior and
-						extensibility.
-					</p>
-				</li>
-				<li>
-					<p>Validation (validation):</p>
-				</li>
-				<li>
-					<p>
-						Web (web): Provides functionality for simple
-						(non-J2EE) web projects.
-					</p>
-				</li>
-				<li>
-					<p>Web Services (ws):</p>
-				</li>
-				<li>
-					<p>Web Services Definition Language (wsdl):</p>
-				</li>
-				<li>
-					<p>Web Services I(?) (wsi):</p>
-				</li>
-				<li>
-					<p>
-						eXtensible Modeling Language (xml): Provides a
-						SSE-based XML source model, editor, validator,
-						and an advanced XML editor with a design page
-					</p>
-				</li>
-				<li>
-					<p>eXtensible Schema Definitions (xsd):</p>
-				</li>
-			</ul>
-		</P>
-	</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/api-overview/overview/Idea.jpg b/docs/org.eclipse.wst.doc.isv/api-overview/overview/Idea.jpg
deleted file mode 100644
index 119ce70..0000000
--- a/docs/org.eclipse.wst.doc.isv/api-overview/overview/Idea.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/book.css b/docs/org.eclipse.wst.doc.isv/book.css
deleted file mode 100644
index a4eedda..0000000
--- a/docs/org.eclipse.wst.doc.isv/book.css
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/build.xml b/docs/org.eclipse.wst.doc.isv/build.xml
deleted file mode 100644
index 3039ff3..0000000
--- a/docs/org.eclipse.wst.doc.isv/build.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.doc.isv" default="build.jars" basedir=".">
-
-	<target name="init">
-		<property name="plugin" value="org.eclipse.wst.doc.isv"/>
-		<property name="version.suffix" value="1.0.201"/>
-		<property name="full.name" value="${plugin}_${version.suffix}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<property name="build.result.folder" value="${basedir}"/>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.wst.doc.isv for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.wst.doc.isv.">
-	</target>
-
-	<target name="build.sources" depends="init">
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<ant antfile="javadoc.xml" dir="${basedir}"/>
-		<ant antfile="buildExtDocs.xml" dir="${basedir}"/>
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<copy todir="${destination.temp.folder}/${full.name}">
-			<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_WST.xml,topics_Reference.xml,META-INF/,html/,reference/,book.css,notices.html,topics_ExtPoint_Reference.xml,schema.css,javadoctoc.xml"/>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}"/>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.wst.doc.isv of all the zips, jars and logs created.">
-		<delete file="${plugin.destination}/${full.name}.jar"/>
-		<delete file="${plugin.destination}/${full.name}.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.wst.doc.isv.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
-		</delete>
-		<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>
diff --git a/docs/org.eclipse.wst.doc.isv/buildExtDocs.properties b/docs/org.eclipse.wst.doc.isv/buildExtDocs.properties
deleted file mode 100644
index 7757c3a..0000000
--- a/docs/org.eclipse.wst.doc.isv/buildExtDocs.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-################################################################
-# Information for extension point overview document
-################################################################
-# Overview document title
-title = WTP Web Standard Tools (WST) Extension Points
-header = WST Extension Points 
-# Introduction paragraph
-overview = The following extension points can be used to extend the capabilities of the WST infrastructure:
-
-# A list of the extension points that should be included in the
-# extension point documentation.
-listed-ext-points=org.eclipse.wst.common.emfworkbench.integration.adapterFactory,\
-org.eclipse.wst.common.emfworkbench.integration.editModel,\
-org.eclipse.wst.common.emfworkbench.integration.editModelExtension,\
-org.eclipse.wst.common.frameworks.DataModelProviderExtension,\
-org.eclipse.wst.common.frameworks.functionGroup,\
-org.eclipse.wst.common.frameworks.OperationExtension,\
-org.eclipse.wst.common.frameworks.ui.DataModelWizardExtension,\
-org.eclipse.wst.common.frameworks.ui.extendableWizard,\
-org.eclipse.wst.common.frameworks.ui.extendedViewer,\
-org.eclipse.wst.common.frameworks.ui.wizardPageGroup,\
-org.eclipse.wst.common.frameworks.ui.wtpuiAction,\
-org.eclipse.wst.common.frameworks.WTPActivityBridgeHelper,\
-org.eclipse.wst.common.modulecore.artifactedit,\
-org.eclipse.wst.common.modulecore.ComponentProjectMigrator,\
-org.eclipse.wst.common.project.facet.core.defaultFacets,\
-org.eclipse.wst.common.project.facet.core.facets,\
-org.eclipse.wst.common.project.facet.core.runtimes,\
-org.eclipse.wst.common.project.facet.core.validators,\
-org.eclipse.wst.common.project.facet.ui.images,\
-org.eclipse.wst.common.project.facet.ui.wizardPages,\
-org.eclipse.wst.common.snippets.SnippetContributions,\
-org.eclipse.wst.common.ui.exampleProjectCreationWizard,\
-org.eclipse.wst.common.ui.properties.propertyContributor,\
-org.eclipse.wst.common.ui.properties.propertySections,\
-org.eclipse.wst.common.ui.properties.propertyTabs,\
-org.eclipse.wst.common.uriresolver.resolverExtensions,\
-org.eclipse.wst.internet.cache.cacheresource,\
-org.eclipse.wst.internet.monitor.core.internalContentFilters,\
-org.eclipse.wst.internet.monitor.core.internalProtocolAdapters,\
-org.eclipse.wst.internet.monitor.ui.viewers,\
-org.eclipse.wst.server.core.clients,\
-org.eclipse.wst.server.core.installableRuntimes,\
-org.eclipse.wst.server.core.installableServers,\
-org.eclipse.wst.server.core.internalServerMonitors,\
-org.eclipse.wst.server.core.launchableAdapters,\
-org.eclipse.wst.server.core.moduleArtifactAdapters,\
-org.eclipse.wst.server.core.moduleFactories,\
-org.eclipse.wst.server.core.moduleTypes,\
-org.eclipse.wst.server.core.publishTasks,\
-org.eclipse.wst.server.core.runtimeLocators,\
-org.eclipse.wst.server.core.runtimeTargetHandlers,\
-org.eclipse.wst.server.core.runtimeTypes,\
-org.eclipse.wst.server.core.serverLocators,\
-org.eclipse.wst.server.core.serverTypes,\
-org.eclipse.wst.server.ui.audio,\
-org.eclipse.wst.server.ui.editorActions,\
-org.eclipse.wst.server.ui.editorPages,\
-org.eclipse.wst.server.ui.editorPageSections,\
-org.eclipse.wst.server.ui.initialSelectionProvider,\
-org.eclipse.wst.server.ui.serverImages,\
-org.eclipse.wst.server.ui.wizardFragments,\
-org.eclipse.wst.sse.ui.editorConfiguration,\
-org.eclipse.wst.validation.referencialFileValidator,\
-org.eclipse.wst.validation.validationHelper,\
-org.eclipse.wst.validation.validationSelectionHandler,\
-org.eclipse.wst.validation.validator,\
-org.eclipse.wst.validation.validatorDelegates,\
-org.eclipse.wst.ws.locator,\
-org.eclipse.wst.wsdl.validation.extvalidator,\
-org.eclipse.wst.wsdl.validation.wsdl11validator,\
-org.eclipse.wst.xml.core.catalogContributions,\
-org.eclipse.wst.xml.core.errorCustomizer 
diff --git a/docs/org.eclipse.wst.doc.isv/buildExtDocs.xml b/docs/org.eclipse.wst.doc.isv/buildExtDocs.xml
deleted file mode 100644
index 98f7b2e..0000000
--- a/docs/org.eclipse.wst.doc.isv/buildExtDocs.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
-
-	<property file="buildExtDocs.properties"/>
-	<property name="outputDir" value="${basedir}${file.separator}reference${file.separator}extension-points"/>
-	<property name="xmlOutputDir" value="${outputDir}${file.separator}xml${file.separator}"/>
-	<property name="commonOutputDir" value="${outputDir}${file.separator}common${file.separator}"/>
-	<property name="rdbOutputDir" value="${outputDir}${file.separator}rdb${file.separator}"/>
-	<property name="serverOutputDir" value="${outputDir}${file.separator}server${file.separator}"/>
-	<property name="webOutputDir" value="${outputDir}${file.separator}web${file.separator}"/>
-	<property name="wsOutputDir" value="${outputDir}${file.separator}ws${file.separator}"/>
-
-	<target name="createExtDocs" depends="buildExtDocs, createDocListings"/>
-	
-	<target name="buildExtDocs" depends="buildXMLExtDocs, buildCommonExtDocs, buildRDBExtDocs, buildServerExtDocs, buildWebExtDocs, buildWSExtDocs"/>
-		
- 	<target name="buildXMLExtDocs">
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.sse.core/plugin.xml" destination="${xmlOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.xml.core/plugin.xml" destination="${xmlOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.sse.ui/plugin.xml" destination="${xmlOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.xml.ui/plugin.xml" destination="${xmlOutputDir}" />
- 		
- 		<!-- Get the list of extension doc files. -->
- 		<fileset dir="${xmlOutputDir}" casesensitive="yes" id="ext-docs-list-xml">
- 			<include name="*.html"/>
- 		</fileset>
- 						
- 		<!-- Convert the list to an XML representation. -->
- 		<pathconvert property="ext-doc-xml" refid="ext-docs-list-xml" pathsep="&lt;/file&gt;&lt;file&gt;">
- 			<map from="${xmlOutputDir}" to=""/>
- 		</pathconvert>
- 		<echo file="xmlextdocs.xml">&lt;files component="xml"&gt;&lt;file&gt;${ext-doc-xml}&lt;/file&gt;&lt;/files&gt;</echo>
- 						
- 	</target>
- 	
- 	<target name="buildCommonExtDocs">
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.command.env/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.emf/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.frameworks/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.modulecore/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.project.facet.core/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.uriresolver/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.internet.cache/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.validation/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.command.env.ui/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.frameworks.ui/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.project.facet.ui/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.snippets/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.ui/plugin.xml" destination="${commonOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.ui.properties/plugin.xml" destination="${commonOutputDir}" />
- 		
- 		<!-- Get the list of extension doc files. -->
- 		<fileset dir="${commonOutputDir}" casesensitive="yes" id="ext-docs-list-common">
- 			<include name="*.html"/>
- 		</fileset>
- 						
- 		<!-- Convert the list to an XML representation. -->
- 		<pathconvert property="ext-doc-common" refid="ext-docs-list-common" pathsep="&lt;/file&gt;&lt;file&gt;">
- 			<map from="${commonOutputDir}" to=""/>
- 		</pathconvert>
- 		<echo file="commonextdocs.xml">&lt;files component="common"&gt;&lt;file&gt;${ext-doc-common}&lt;/file&gt;&lt;/files&gt;</echo>
- 						
- 	</target>
- 		
- 	<target name="buildRDBExtDocs">
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.core/plugin.xml" destination="${rdbOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.data.core/plugin.xml" destination="${rdbOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.connection.ui/plugin.xml" destination="${rdbOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.core.ui/plugin.xml" destination="${rdbOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.data.ui/plugin.xml" destination="${rdbOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.outputview/plugin.xml" destination="${rdbOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.server.extensions/plugin.xml" destination="${rdbOutputDir}" />
- 		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.rdb.server.ui/plugin.xml" destination="${rdbOutputDir}" />
- 		
- 		<!-- Get the list of extension doc files. -->
- 		<fileset dir="${rdbOutputDir}" casesensitive="yes" id="ext-docs-list-rdb">
- 			<include name="*.html"/>
- 		</fileset>
- 						
- 		<!-- Convert the list to an XML representation. -->
- 		<pathconvert property="ext-doc-rdb" refid="ext-docs-list-rdb" pathsep="&lt;/file&gt;&lt;file&gt;">
- 			<map from="${rdbOutputDir}" to=""/>
- 		</pathconvert>
- 		<echo file="rdbextdocs.xml">&lt;files component="rdb"&gt;&lt;file&gt;${ext-doc-rdb}&lt;/file&gt;&lt;/files&gt;</echo>
- 						
-	</target>
- 	
-	<target name="buildServerExtDocs">
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.internet.monitor.core/plugin.xml" destination="${serverOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.server.core/plugin.xml" destination="${serverOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.internet.monitor.ui/plugin.xml" destination="${serverOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.server.ui/plugin.xml" destination="${serverOutputDir}" />
-		
-		<!-- Get the list of extension doc files. -->
-		<fileset dir="${serverOutputDir}" casesensitive="yes" id="ext-docs-list-server">
-			<include name="*.html"/>
-		</fileset>
-						
-		<!-- Convert the list to an XML representation. -->
-		<pathconvert property="ext-doc-server" refid="ext-docs-list-server" pathsep="&lt;/file&gt;&lt;file&gt;">
-			<map from="${serverOutputDir}" to=""/>
-		</pathconvert>
-		<echo file="serverextdocs.xml">&lt;files component="server"&gt;&lt;file&gt;${ext-doc-server}&lt;/file&gt;&lt;/files&gt;</echo>
-						
-	</target>
-	
-	<target name="buildWebExtDocs">
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.common.emfworkbench.integration/plugin.xml" destination="${webOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.html.ui/plugin.xml" destination="${webOutputDir}" />
-		
-		<!-- Get the list of extension doc files. -->
-		<fileset dir="${webOutputDir}" casesensitive="yes" id="ext-docs-list-web">
-			<include name="*.html"/>
-		</fileset>
-						
-		<!-- Convert the list to an XML representation. -->
-		<pathconvert property="ext-doc-web" refid="ext-docs-list-web" pathsep="&lt;/file&gt;&lt;file&gt;">
-			<map from="${webOutputDir}" to=""/>
-		</pathconvert>
-		<echo file="webextdocs.xml">&lt;files component="web"&gt;&lt;file&gt;${ext-doc-web}&lt;/file&gt;&lt;/files&gt;</echo>
-						
-	</target>
-
-	<target name="buildWSExtDocs">
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.ws/plugin.xml" destination="${wsOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.wsdl/plugin.xml" destination="${wsOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.wsdl.ui/plugin.xml" destination="${wsOutputDir}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.wsdl.validation/plugin.xml" destination="${wsOutputDir}" />
-		
-		<!-- Get the list of extension doc files. -->
-		<fileset dir="${wsOutputDir}" casesensitive="yes" id="ext-docs-list-ws">
-			<include name="*.html"/>
-		</fileset>
-				
-		<!-- Convert the list to an XML representation. -->
-		<pathconvert property="ext-doc-ws" refid="ext-docs-list-ws" pathsep="&lt;/file&gt;&lt;file&gt;">
-			<map from="${wsOutputDir}" to=""/>
-		</pathconvert>
-		<echo file="wsextdocs.xml">&lt;files component="ws"&gt;&lt;file&gt;${ext-doc-ws}&lt;/file&gt;&lt;/files&gt;</echo>
-				
-	</target>
-	
-	<target name="createDocListings">
-		<!-- Create the overview document. -->
-		<xslt basedir="${basedir}" in="extDocListings.xml" out="${outputDir}${file.separator}index.html" style="extDocOverview.xsl">
-  			<param name="title" expression="${title}"/>
-  			<param name="header" expression="${header}"/>
-  			<param name="overview" expression="${overview}"/>
-			<param name="listed-ext-points" expression="${listed-ext-points}"/>
-		</xslt>
-		
-		<!-- Create the extention point toc. -->
-		<xslt basedir="${basedir}" in="extDocListings.xml" out="topics_ExtPoint_Reference.xml" style="extDocToc.xsl">
-			<param name="listed-ext-points" expression="${listed-ext-points}"/>
-			<outputproperty name="method" value="xml"/>
-			<outputproperty name="indent" value="yes"/>
-		</xslt>
-		
-	</target>
-</project>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.isv/extDocListings.xml b/docs/org.eclipse.wst.doc.isv/extDocListings.xml
deleted file mode 100644
index 4a55448..0000000
--- a/docs/org.eclipse.wst.doc.isv/extDocListings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components>
-	<component name="XML" id="xml" file="xmlextdocs.xml"/>
-	<component name="Common" id="common" file="commonextdocs.xml"/>
-	<component name="Server" id="server" file="serverextdocs.xml"/>
-	<component name="Web" id="web" file="webextdocs.xml"/>
-	<component name="Web Services" id="ws" file="wsextdocs.xml"/>
-	<!-- 
-	<component name="Relational Data Tools" id="rdb" file="rdbextdocs.xml"/>
-	-->
-</components>
diff --git a/docs/org.eclipse.wst.doc.isv/extDocOverview.xsl b/docs/org.eclipse.wst.doc.isv/extDocOverview.xsl
deleted file mode 100644
index ffe0ef1..0000000
--- a/docs/org.eclipse.wst.doc.isv/extDocOverview.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt">
-    <xsl:param name="title"/>
-    <xsl:param name="header"/>
-    <xsl:param name="overview"/>
-    <xsl:param name="listed-ext-points"/>
-    
-    <xsl:template match="components">
-    	
-    	<xsl:text disable-output-escaping="yes">
-    	&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"&gt;
-		</xsl:text>
-		<html>
-		<head>
-		<xsl:text disable-output-escaping="yes">
-		&lt;meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." &gt;
-
-   		&lt;meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"&gt;
-   		</xsl:text>
-   		<title><xsl:value-of select="$title"/></title>
-   		<xsl:text disable-output-escaping="yes">
-		&lt;LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css"&gt;
-		</xsl:text>
-		</head>
-		<body link="#0000FF" vlink="#800080">
-
-		<center>
-		<h1><xsl:value-of select="$header"/></h1>
-		</center>
-
-		<xsl:value-of select="$overview"/>
-    	<xsl:for-each select="component">
-    		<xsl:sort select="@id"/>
-    		<h3><a name="{@id}"></a><xsl:value-of select="@name"/></h3>
-    		<ul>
-    			<xsl:for-each select="document(@file)/files/file">
-    				<xsl:sort select="text()"/>
-    				<xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
-  						<li>
-  							<a href="{../@component}/{text()}"><xsl:value-of select="translate(substring(text(), 0, string-length(text()) - 4),'_','.')"/></a> 
-  						</li>
-  					</xsl:if>
-    			</xsl:for-each>
-    		</ul>
-    	</xsl:for-each>
-    	</body>
-		</html>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.wst.doc.isv/extDocToc.xsl b/docs/org.eclipse.wst.doc.isv/extDocToc.xsl
deleted file mode 100644
index 30e54b8..0000000
--- a/docs/org.eclipse.wst.doc.isv/extDocToc.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt"
-    exclude-result-prefixes="xalan">
-    <xsl:param name="listed-ext-points"/>
-    
-     <xsl:template match="components">
-     	<xsl:text disable-output-escaping="yes">
-&lt;?NLS TYPE="org.eclipse.help.toc"?&gt;
-	 	</xsl:text>
-	 	<toc label="Extension Points Reference">
-	 		<xsl:for-each select="document(component/@file)/files/file">
-	 			<xsl:sort select="text()"/>
-	 			<xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
-	 				<topic label="{translate(substring(text(), 0, string-length(text()) - 4),'_','.')}" href="reference/extension-points/{../@component}/{text()}">
-	 				</topic>
-	 			</xsl:if>
-	 		</xsl:for-each>
-	 	</toc> 
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/docs/org.eclipse.wst.doc.isv/generatingExtensionDocsReadme.txt b/docs/org.eclipse.wst.doc.isv/generatingExtensionDocsReadme.txt
deleted file mode 100644
index f5bde3e..0000000
--- a/docs/org.eclipse.wst.doc.isv/generatingExtensionDocsReadme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-To generate extension documentation:
-
-1. Add the PDE generation task for the plug-in to buildExtDocs.xml.
-
-2. If the plug-in is in a new component add a generation task for the 
-   component to buildExtDocs.xml and add the component to extDocListings.xml.
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.isv/html/book.html b/docs/org.eclipse.wst.doc.isv/html/book.html
deleted file mode 100644
index 8ddb8fa..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/book.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta
-  http-equiv="Content-Type"
-  content="text/html; charset=iso-8859-1">
-<meta
-  name="GENERATOR"
-  content="Mozilla/4.73 [en] (Win98; U) [Netscape]">
-<title>splash</title>
-<link
-  rel="stylesheet"
-  href="sources/formate.css">
-</head>
-<body>
-<center>
-<h1>Online Help</h1>
-</center>
-<p>The description of the API and the plugins of the WTP and their
-Extensions (-Points)</p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/check_out_tutorial.html b/docs/org.eclipse.wst.doc.isv/html/check_out_tutorial.html
deleted file mode 100644
index b3255b1..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/check_out_tutorial.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta
-  http-equiv="Content-Type"
-  content="text/html; charset=iso-8859-1">
-<title>Checking WTP out</title>
-<link
-  rel="stylesheet"
-  type="text/css"
-  href="sources/formate.css">
-</head>
-
-<body>
-<p class="ueberschrift">How to check out the WTP plugins</p>
-
-<p>It is recommended to check out the plugins via the releng tools using
-map files provided by the project.<br>
-The main advantage of this approach is to have a reproducable build, and
-that way you can easily check out exactly the code that is contained in
-builds produced by the web tools project (I-Builds, M-Builds, Releases).<br>
-This approach makes general handling easier and is as well more helpful
-for the project when submitting bugreports or supplying pachtes.
-Checking out HEAD is not recommended as it is not reproducable.<br>
-
-</p>
-
-<ul>
-  <li>
-  <p>First, download the current releng tools version. The releng tools download
-  is availble at the bottom of the download page for the specific version of 
-  Eclipse you have installed.</p>
-  </li>
-</ul>
-<ul>
-  <li>Then you will need all the map files of the included plug-ins. The
-  whole collection of map files is available on each WTP download page from 
-  the link entitled "map files".</li>
-</ul>
-<ul>
-  <li>Create a new project in Eclipse. Create a new file with an .map
-  extension. Paste all maps from the link above into the file.</li>
-</ul>
-<ul>
-  <li>Right-click on the file. Select: Team - Load Map Projects. (If you
-  copyed all map files into the file, it will take a little longer).</li>
-</ul>
-<ul>
-  <li>When you're finished, you've checked out all WTP plugins out of
-  the Eclipse CVS.<br>
-  The plugins are all located in the same project/directory.</li>
-</ul>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/AdapterFactoryExtension.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/AdapterFactoryExtension.htm
deleted file mode 100644
index 5ae8e06..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/AdapterFactoryExtension.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Adapter Factory Extension</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Adapter Factory Extension</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etools.emf.workbench.adapterFactory<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>This is used to register an adapter factory with the dynamic adapter factory.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.adapterFactory">adapterFactory</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.adapterFactory">adapterFactory</a> (<a href="#e.view">view</a>*)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST adapterFactory</p>
-<p class=code id=dtdAttlist>packageURI&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>className&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>functionGroupID&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-Defines the Adapter Factory being added. All added Adapter Factories are queriable whenever their Function Group and optional Viewer Id are specified.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>packageURI</b> - The package URI that you are extending (for example "ejb.xmi")</li>
-<li><b>className</b> - The fully qualified name of the class which implements org.eclipse.emf.common.notify.AdapterFactory.</li>
-<li><b>id</b> - The Unique identifier of the Adapter Factory extension.  This will associate it with one or more function groups based on the function group patterns.  Function Groups allow Content and Actions to be enabled or disabled based on project-specific information. Generally, they are used by vendors who wish to add functionality specific to their products, e.g. J2EE Application Servers.</li>
-<li><b>functionGroupID</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.view">view</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST view</p>
-<p class=code id=dtdAttlist>id&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - An optional viewer Id which will limit the invocation of the defined Adapter Factory to the given viewer id.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/DataModelProvider.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/DataModelProvider.htm
deleted file mode 100644
index ad2720e..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/DataModelProvider.htm
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>DataModelProvider</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>DataModelProvider</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.wst.common.frameworks.DataModelProviderExtension<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.DataModelProvider">DataModelProvider</a>? , <a href="#e.ProviderDefinesType">ProviderDefinesType</a>? , <a href="#e.ProviderImplementsType">ProviderImplementsType</a>?)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.DataModelProvider">DataModelProvider</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST DataModelProvider</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>class&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - </li>
-<li><b>class</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.ProviderDefinesType">ProviderDefinesType</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST ProviderDefinesType</p>
-<p class=code id=dtdAttlist>providerType&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>providerID&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>providerType</b> - </li>
-<li><b>providerID</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.ProviderImplementsType">ProviderImplementsType</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST ProviderImplementsType</p>
-<p class=code id=dtdAttlist>providerType&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>providerID&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>providerType</b> - </li>
-<li><b>providerID</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/DataModelWizardExtension.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/DataModelWizardExtension.htm
deleted file mode 100644
index 5ffb212..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/DataModelWizardExtension.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>DataModelWizard</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>DataModelWizard</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.wst.common.frameworks.ui.DataModelWizardExtension<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.DataModelWizard">DataModelWizard</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.DataModelWizard">DataModelWizard</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST DataModelWizard</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>class&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - </li>
-<li><b>class</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
-
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/EMFRessourceEditModel.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/EMFRessourceEditModel.htm
deleted file mode 100644
index 46e2a4a..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/EMFRessourceEditModel.htm
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>EMF Resource Edit Model</title>
-<link rel="stylesheet" type="text/css" href="schema.css")
-</HEAD>
-<BODY>
-<H1><CENTER>EMF Resource Edit Model</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etools.emf.workbench.editModel<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>6.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>Edit models provide a framework for managing a set of EMF resources within a unit of work.  For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources.  Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor.  By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.editModel">editModel</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.editModel">editModel</a> (<a href="#e.editModelResource">editModelResource</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST editModel</p>
-<p class=code id=dtdAttlist>editModelID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>factoryClass&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>loadUnknownResourcesAsReadOnly&nbsp;(true | false) <p class=code id=dtdAttlist>parentModelID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-The declaration for an edit model to be used in the workspace.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>editModelID</b> - A unique identifier for the edit model.</li>
-<li><b>factoryClass</b> - An optional factory class that is used for this edit model.  The class must implement the interface <code>com.ibm.etools.emf.workbench.edit.EditModelFactory</code>. If none is specified, then a generic <code>EditModel</code> is created.</li>
-<li><b>loadUnknownResourcesAsReadOnly</b> - </li>
-<li><b>parentModelID</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.editModelResource">editModelResource</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST editModelResource</p>
-<p class=code id=dtdAttlist>URI&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>autoload&nbsp;(true | false) "false"&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This is an individual contribution of a resource to the edit model.  If more than one instance of the same URI is registered against an edit model id, the resource is still only loaded once.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>URI</b> - The URI of the resource relative to the root container from which EMF resources are loaded.</li>
-<li><b>autoload</b> - Indicator which determines whether this resource should be autoloaded when the edit model is created, or when an IFile corresponding to this resource is added.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6><br>
-<code>
-&nbsp;&nbsp;&nbsp;&lt;extension<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id="editModel.acme.parent"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name="Acme&nbsp;Parent&nbsp;Edit&nbsp;Model"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point="com.ibm.etools.emf.workbench.editModel"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModel<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;editModelID="com.acme.acmepro.parent.editModel"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;factoryClass="com.ibm.etools.emf.workbench.edit.EditModelFactory"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModelResource&nbsp;URI="DIR/resource0.xml"&nbsp;/&gt;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModelResource&nbsp;URI="DIR/resource1.xml"&nbsp;/&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/editModel&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/extension&gt;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&lt;extension<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id="editModel.acme.child"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name="Acme&nbsp;Child&nbsp;Edit&nbsp;Model"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point="com.ibm.etools.emf.workbench.editModel"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModel<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;editModelID="com.acme.acmepro.child.editModel"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;factoryClass="com.ibm.etools.emf.workbench.edit.EditModelFactory"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parentModelID="com.acme.acmepro.parent.editModel"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModelResource&nbsp;URI="DIR/resource2.xml"&nbsp;/&gt;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModelResource&nbsp;URI="DIR/resource3.xml"&nbsp;/&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/editModel&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/extension&gt;&nbsp;&nbsp;&nbsp;<br>
-</code>
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>Edit Models can be accessed through the com.ibm.etools.emf.workbench.EMFWorkbenchContext.
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/EditModelExtension.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/EditModelExtension.htm
deleted file mode 100644
index 9be3d63..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/EditModelExtension.htm
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Edit Model Extension</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Edit Model Extension</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etoosl.emf.workbench.geditModelExtension<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>6.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>The Edit Model Extension allows third parties to contribute expected resources to Edit Models. The functionGroupID allows users to select which extensions they choose to have enabled.<p>
-Edit models provide a framework for managing a set of EMF resources within a unit of work.  For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources.  Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor.  By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.editModelExtension">editModelExtension</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.editModelExtension">editModelExtension</a> (<a href="#e.editModelResource">editModelResource</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST editModelExtension</p>
-<p class=code id=dtdAttlist>editModelID&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-Edit model extensions allow components to contribute known resource URIs to an edit model.  Whenever an edit model is loaded, the resources will automatically be loaded and managed by the edit model.  Changes to the resources will be tracked and saved during operations or editor saves.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>editModelID</b> - The unique id of the edit model being extended.</li>
-<li><b>id</b> - The unique identifier for this extension.  This will be used to associate it with a function group pattern binding.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.editModel">editModel</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.editModel">editModel</a> (<a href="#e.editModelResource">editModelResource</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST editModel</p>
-<p class=code id=dtdAttlist>editModelID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>factoryClass&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>loadUnknownResourcesAsReadOnly&nbsp;(true | false) <p class=code id=dtdAttlist>parentModelID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-The declaration for an edit model to be used in the workspace.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>editModelID</b> - A unique identifier for the edit model.</li>
-<li><b>factoryClass</b> - An optional factory class that is used for this edit model.  The class must implement the interface <code>com.ibm.etools.emf.workbench.edit.EditModelFactory</code>. If none is specified, then a generic <code>EditModel</code> is created.</li>
-<li><b>loadUnknownResourcesAsReadOnly</b> - </li>
-<li><b>parentModelID</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.editModelResource">editModelResource</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST editModelResource</p>
-<p class=code id=dtdAttlist>URI&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>autoload&nbsp;(true | false) "false"&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This is an individual contribution of a resource to the edit model.  If more than one instance of the same URI is registered against an edit model id, the resource is still only loaded once.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>URI</b> - The URI of the resource relative to the root container from which EMF resources are loaded.</li>
-<li><b>autoload</b> - Indicator which determines whether this resource should be autoloaded when the edit model is created, or when an IFile corresponding to this resource is added.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6><br>
-<code>
-&nbsp;&nbsp;&nbsp;&lt;extension<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point="com.ibm.etools.emf.workbench.editModelExtension"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModelExtension<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;editModelID="com.ibm.etools.inheritance.parent.editModel"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;functionGroupID="com.ibm.etools.websphere.group"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModelResource&nbsp;URI="DIR/extension0.xml"/&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;editModelResource&nbsp;URI="DIR/extension1.xml"/&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/editModelExtension&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/extension&gt;<br>
-</code>
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/ExtendabledOperation.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/ExtendabledOperation.htm
deleted file mode 100644
index d212370..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/ExtendabledOperation.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ExtendabledOperation</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>ExtendabledOperation</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etools.j2ee.ExtendableOperation<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.extendableOperation">extendableOperation</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.extendableOperation">extendableOperation</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extendableOperation</p>
-<p class=code id=dtdAttlist>class&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>class</b> - </li>
-<li><b>id</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/FunctionGroup.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/FunctionGroup.htm
deleted file mode 100644
index 282bdc1..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/FunctionGroup.htm
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Grouping for function contribution</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Grouping for function contribution</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etools.emf.workbench.group<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>6.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>A functionGroup provides a grouping of related function that can be contributed to the tools.  For example, a third party component may want to contribute actions, editor pages, edit model resources, and many other functions specific to a given product.  By associating all these functions with a group id, a mechanism is exposed for users to selectively enable and disable baskets of function.  Extension points that allow for a "groupID" attribute generally will hide those functions when the group id is disabled.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.functionGroup">functionGroup</a>+ | <a href="#e.functionGroupPatternBinding">functionGroupPatternBinding</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.functionGroup">functionGroup</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST functionGroup</p>
-<p class=code id=dtdAttlist>functionGroupID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>icon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>url&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>priority&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>initializerClassName&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-Extension point definition for a group.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>functionGroupID</b> - A unique id for the group.</li>
-<li><b>name</b> - A human readable name.</li>
-<li><b>description</b> - A short description of the group.</li>
-<li><b>icon</b> - </li>
-<li><b>url</b> - </li>
-<li><b>priority</b> - Ordering magnitude of plugins</li>
-<li><b>initializerClassName</b> - Class used to determine plugin enablement</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.functionGroupPatternBinding">functionGroupPatternBinding</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST functionGroupPatternBinding</p>
-<p class=code id=dtdAttlist>functionGroupID&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>pattern&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element allows one to bind function groups to patterns.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>functionGroupID</b> - The unique identifier of the function group to bind.</li>
-<li><b>pattern</b> - The pattern to be bound. Patterns are regular expressions which match unique identifiers.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6><code>
-&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&lt;extension<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point="com.ibm.wtp.common.functionGroup"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;functionGroup<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name="Acme&nbsp;Co.&nbsp;Function&nbsp;Extension"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;functionGroupID="com.acme.acmepro"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;description="The&nbsp;AcmePro&nbsp;Extensions&nbsp;add&nbsp;integration&nbsp;to&nbsp;the&nbsp;Acme&nbsp;Web&nbsp;Server."<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enabledByDefault="true"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;icon="..."<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;url="http://www.acme.com/"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/extension&gt;<br>
-</code>
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>WTP Function Groups can be referenced through com.ibm.wtp.common.group.WTPFunctionGroupRegistry.
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/ModifierHelperFactory.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/ModifierHelperFactory.htm
deleted file mode 100644
index 048aadf..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/ModifierHelperFactory.htm
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ModifierHelperFactory</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>ModifierHelperFactory</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.wtp.emf.workbench.edit.ModifierHelperFactory<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.factory">factory</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This is used to register for the model modifiers.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.factory">factory</a> (<a href="#e.package">package</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST factory</p>
-<p class=code id=dtdAttlist>class&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>class</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.package">package</a> (<a href="#e.type">type</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST package</p>
-<p class=code id=dtdAttlist>uri&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>uri</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.type">type</a> (<a href="#e.feature">feature</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST type</p>
-<p class=code id=dtdAttlist>name&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.feature">feature</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST feature</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>action&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - </li>
-<li><b>action</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/OperationExtension.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/OperationExtension.htm
deleted file mode 100644
index e627ecf..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/OperationExtension.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>OperationExtension</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>OperationExtension</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etools.j2ee.com.ibm.etools.operations.extension<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.operationExtension">operationExtension</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.operationExtension">operationExtension</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST operationExtension</p>
-<p class=code id=dtdAttlist>preOperationClass&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>postOperationClass&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>preOperationClass</b> - </li>
-<li><b>postOperationClass</b> - </li>
-<li><b>id</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/WTPActivityBridge.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/WTPActivityBridge.htm
deleted file mode 100644
index 41a6681..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/WTPActivityBridge.htm
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>WTPActivityBridge</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>WTPActivityBridge</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.wst.common.frameworks.WTPActivityBridge<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.WTPActivityBridgeHelper">WTPActivityBridgeHelper</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.WTPActivityBridgeHelper">WTPActivityBridgeHelper</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST WTPActivityBridgeHelper</p>
-<p class=code id=dtdAttlist>class&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>class</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/actionProvider.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/actionProvider.htm
deleted file mode 100644
index 1439e69..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/actionProvider.htm
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Common Action Provider</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Common Action Provider</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.wst.common.navigator.views.actionProvder<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]<p>
-An action's enablement and/or visibility can be defined using the elements <samp>enablement</samp> and <samp>visibility</samp> respectively. These two elements contain a boolean expression that is evaluated to determine the enablement and/or visibility.
-<p>
-The syntax is the same for the <samp>enablement</samp> and <samp>visibility</samp> elements. Both contain only one boolean expression sub-element. In the simplest case, this will be an <samp>objectClass</samp>, <samp>objectState</samp>, <samp>pluginState</samp>, or <samp>systemProperty</samp> element. In the more complex case, the <samp>and</samp>, <samp>or</samp>, and <samp>not</samp> elements can be combined to form a boolean expression. Both the <samp>and</samp>, and <samp>or</samp> elements must contain 2 sub-elements. The <samp>not</samp> element must contain only 1 sub-element.
-</p></p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.actionProvider">actionProvider</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.actionProvider">actionProvider</a> (<a href="#e.enablement">enablement</a> , <a href="#e.emfEnablement">emfEnablement</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST actionProvider</p>
-<p class=code id=dtdAttlist>class&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>class</b> - A class which implments the ICommonActionProvider interface.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.enablement">enablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension. 
-Objects which are accepted by the expression will cause the ActionProvider to be invoked.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.emfEnablement">emfEnablement</a> (#PCDATA)&gt;</p>
-<p></p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.enablement">enablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.visibility">visibility</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the visibility for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.and">and</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean AND operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.or">or</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean OR operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.not">not</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean NOT operation on the result of evaluating it's sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.objectClass">objectClass</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectClass</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>adaptable&nbsp;(true | false) &gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the class or interface of each object in the current selection. If each object in the selection implements the specified class or interface, the expression is evaluated as true.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - a fully qualified name of a class or interface.  The expression is evaluated as true only if all objects within the selection implement this class or interface.</li>
-<li><b>adaptable</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.objectState">objectState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectState</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the attribute state of each object in the current selection. If each object in the selection has the specified attribute state, the expression is evaluated as true. To evaluate this type of expression, each object in the selection must implement, or adapt to, <samp>org.eclipse.ui.IActionFilter</samp> interface.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of an object's attribute. Acceptable names reflect the object type, and should be publicly declared by the plug-in where the object type is declared.</li>
-<li><b>value</b> - the required value of the object's attribute. The acceptable values for the object's attribute should be publicly declared.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.pluginState">pluginState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST pluginState</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;(installed|activated) "installed"&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of a plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - the identifier of a plug-in which may or may not exist in the plug-in registry.</li>
-<li><b>value</b> - the required state of the plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.systemProperty">systemProperty</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST systemProperty</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of some system property.  The property value is retrieved from the <samp>java.lang.System</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of the system property.</li>
-<li><b>value</b> - the required value of the system property.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/book.css b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/book.css
deleted file mode 100644
index c9257b8..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/book.css
+++ /dev/null
@@ -1,106 +0,0 @@
-P.Code {
-	display: block;
-	text-align: left;
-	text-indent: 0.00pt;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 15pt;
-	font-size: 10.000000pt;
-	font-weight: medium;
-	font-style: Regular;
-	color: #4444CC;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New";
-}
-H6.CaptionFigColumn {
-	display: block;
-	text-align: left;
-	text-indent: 0.000000pt;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-	font-size: 9.000000pt;
-	font-weight: medium;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Arial";
-}
-P.Note {
-	display: block;
-	text-align: left;
-	text-indent: 0pt;
-	margin-top: 19.500000pt;
-	margin-bottom: 19.500000pt;
-	margin-right: 0.000000pt;
-	margin-left: 30pt;
-	font-size: 11.000000pt;
-	font-weight: medium;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Arial";
-}
-EM.UILabel {
-	font-weight: Bold;
-	font-style: Regular;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-EM.CodeName {
-	font-weight: Bold;
-	font-style: Regular;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family:"Courier New";
-}
-
-body, html { border: 0px }
-
-
-/* following font face declarations need to be removed for DBCS */
-
-body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000}
-pre				{ font-family: Courier, monospace}
-
-/* end font face declarations */
-
-/* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
-pre				{ font-size: 10pt}
-
-/* end font size declarations */
-
-body	     { background: #FFFFFF}
-h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
-h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
-h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-p            { margin-top: 10px; margin-bottom: 10px }
-pre          { margin-left: 6; font-size: 9pt; color: #4444CC } 
-a:link	     { color: #0000FF }
-a:hover	     { color: #000080 }
-a:visited    { text-decoration: underline }
-ul	     { margin-top: 0; margin-bottom: 10 }
-li	     { margin-top: 0; margin-bottom: 0 } 
-li p	     { margin-top: 0; margin-bottom: 0 } 
-ol	     { margin-top: 0; margin-bottom: 10 }
-dl	     { margin-top: 0; margin-bottom: 10 }
-dt	     { margin-top: 0; margin-bottom: 0; font-weight: bold }
-dd	     { margin-top: 0; margin-bottom: 0 }
-strong	     { font-weight: bold}
-em	     { font-style: italic}
-var	     { font-style: italic}
-div.revision { border-left-style: solid; border-left-width: thin; 
-				   border-left-color: #7B68EE; padding-left:5 }
-th	     { font-weight: bold }
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/commonFilter.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/commonFilter.htm
deleted file mode 100644
index a16fb44..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/commonFilter.htm
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Common Navigator Filter</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Common Navigator Filter</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.ui.views.navigator.filters<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]<p>
-An action's enablement and/or visibility can be defined using the elements <samp>enablement</samp> and <samp>visibility</samp> respectively. These two elements contain a boolean expression that is evaluated to determine the enablement and/or visibility.
-<p>
-The syntax is the same for the <samp>enablement</samp> and <samp>visibility</samp> elements. Both contain only one boolean expression sub-element. In the simplest case, this will be an <samp>objectClass</samp>, <samp>objectState</samp>, <samp>pluginState</samp>, or <samp>systemProperty</samp> element. In the more complex case, the <samp>and</samp>, <samp>or</samp>, and <samp>not</samp> elements can be combined to form a boolean expression. Both the <samp>and</samp>, and <samp>or</samp> elements must contain 2 sub-elements. The <samp>not</samp> element must contain only 1 sub-element.
-</p></p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.commonFilter">commonFilter</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.commonFilter">commonFilter</a> (<a href="#e.enablement">enablement</a>? , (<a href="#e.property">property</a>*))&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST commonFilter</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>navigatorExtensionId&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>viewId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>className&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>enabledByDefault&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - </li>
-<li><b>navigatorExtensionId</b> - </li>
-<li><b>name</b> - </li>
-<li><b>description</b> - </li>
-<li><b>viewId</b> - </li>
-<li><b>className</b> - Must provide a concrete implementation of INavigatorExtensionFilter.</li>
-<li><b>enabledByDefault</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.enablement">enablement</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST enablement</p>
-<p class=code id=dtdAttlist>functionGroup&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>enabled&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>functionGroup</b> - </li>
-<li><b>enabled</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.property">property</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST property</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - </li>
-<li><b>value</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.enablement">enablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.visibility">visibility</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the visibility for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.and">and</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean AND operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.or">or</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean OR operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.not">not</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean NOT operation on the result of evaluating it's sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.objectClass">objectClass</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectClass</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>adaptable&nbsp;(true | false) &gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the class or interface of each object in the current selection. If each object in the selection implements the specified class or interface, the expression is evaluated as true.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - a fully qualified name of a class or interface.  The expression is evaluated as true only if all objects within the selection implement this class or interface.</li>
-<li><b>adaptable</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.objectState">objectState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectState</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the attribute state of each object in the current selection. If each object in the selection has the specified attribute state, the expression is evaluated as true. To evaluate this type of expression, each object in the selection must implement, or adapt to, <samp>org.eclipse.ui.IActionFilter</samp> interface.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of an object's attribute. Acceptable names reflect the object type, and should be publicly declared by the plug-in where the object type is declared.</li>
-<li><b>value</b> - the required value of the object's attribute. The acceptable values for the object's attribute should be publicly declared.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.pluginState">pluginState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST pluginState</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;(installed|activated) "installed"&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of a plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - the identifier of a plug-in which may or may not exist in the plug-in registry.</li>
-<li><b>value</b> - the required state of the plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.systemProperty">systemProperty</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST systemProperty</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of some system property.  The property value is retrieved from the <samp>java.lang.System</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of the system property.</li>
-<li><b>value</b> - the required value of the system property.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/dropHandler.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/dropHandler.htm
deleted file mode 100644
index e39d61a..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/dropHandler.htm
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Common Navigator Drop Handler</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Common Navigator Drop Handler</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.ui.views.navigator.dropHandler<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]<p>
-An action's enablement and/or visibility can be defined using the elements <samp>enablement</samp> and <samp>visibility</samp> respectively. These two elements contain a boolean expression that is evaluated to determine the enablement and/or visibility.
-<p>
-The syntax is the same for the <samp>enablement</samp> and <samp>visibility</samp> elements. Both contain only one boolean expression sub-element. In the simplest case, this will be an <samp>objectClass</samp>, <samp>objectState</samp>, <samp>pluginState</samp>, or <samp>systemProperty</samp> element. In the more complex case, the <samp>and</samp>, <samp>or</samp>, and <samp>not</samp> elements can be combined to form a boolean expression. Both the <samp>and</samp>, and <samp>or</samp> elements must contain 2 sub-elements. The <samp>not</samp> element must contain only 1 sub-element.
-</p></p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.dropHandler">dropHandler</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.dropHandler">dropHandler</a> (<a href="#e.dragEnablement">dragEnablement</a> , <a href="#e.dropEnablement">dropEnablement</a> , <a href="#e.serializers">serializers</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST dropHandler</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>dropActionId&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>description&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - </li>
-<li><b>dropActionId</b> - </li>
-<li><b>class</b> - </li>
-<li><b>name</b> - </li>
-<li><b>description</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.dragEnablement">dragEnablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the dragEnablement for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.dropEnablement">dropEnablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST dropEnablement</p>
-<p class=code id=dtdAttlist>validatorClass&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>validatorClass</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.serializers">serializers</a> (<a href="#e.serializer">serializer</a>+)&gt;</p>
-<p></p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.serializer">serializer</a> (<a href="#e.enablement">enablement</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST serializer</p>
-<p class=code id=dtdAttlist>class&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>class</b> - </li>
-<li><b>id</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.enablement">enablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.visibility">visibility</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the visibility for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.and">and</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean AND operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.or">or</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean OR operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.not">not</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean NOT operation on the result of evaluating it's sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.objectClass">objectClass</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectClass</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>adaptable&nbsp;(true | false) &gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the class or interface of each object in the current selection. If each object in the selection implements the specified class or interface, the expression is evaluated as true.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - a fully qualified name of a class or interface.  The expression is evaluated as true only if all objects within the selection implement this class or interface.</li>
-<li><b>adaptable</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.objectState">objectState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectState</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the attribute state of each object in the current selection. If each object in the selection has the specified attribute state, the expression is evaluated as true. To evaluate this type of expression, each object in the selection must implement, or adapt to, <samp>org.eclipse.ui.IActionFilter</samp> interface.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of an object's attribute. Acceptable names reflect the object type, and should be publicly declared by the plug-in where the object type is declared.</li>
-<li><b>value</b> - the required value of the object's attribute. The acceptable values for the object's attribute should be publicly declared.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.pluginState">pluginState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST pluginState</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;(installed|activated) "installed"&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of a plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - the identifier of a plug-in which may or may not exist in the plug-in registry.</li>
-<li><b>value</b> - the required state of the plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.systemProperty">systemProperty</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST systemProperty</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of some system property.  The property value is retrieved from the <samp>java.lang.System</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of the system property.</li>
-<li><b>value</b> - the required value of the system property.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/extendableWizard.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/extendableWizard.htm
deleted file mode 100644
index 3d9fb1f..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/extendableWizard.htm
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Edit Model Editor</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Edit Model Editor</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etools.emf.workbench.ui.editModelEditor<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>6.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>Edit model editors represent the multi page editors that can be used to edit a collection of EMF resources.  By declaring an edit model editor, the plugin provider allows the framework to generically obtain the edit model used by the editor.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.extendableWizard">extendableWizard</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.extendableWizard">extendableWizard</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extendableWizard</p>
-<p class=code id=dtdAttlist>id&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/extendedViewer.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/extendedViewer.htm
deleted file mode 100644
index 2814694..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/extendedViewer.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Extended Viewer</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Extended Viewer</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.wtp.common.ui.extendedViewer<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>The extendedViewer Extension point allows the contribution of new function</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.extendedViewer">extendedViewer</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.extendedViewer">extendedViewer</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extendedViewer</p>
-<p class=code id=dtdAttlist>viewerID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>parentViewerID&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>factoryClass&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>icon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>label&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>functionGroupID&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>viewerID</b> - </li>
-<li><b>parentViewerID</b> - </li>
-<li><b>factoryClass</b> - </li>
-<li><b>icon</b> - </li>
-<li><b>label</b> - </li>
-<li><b>functionGroupID</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/linkHelper.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/linkHelper.htm
deleted file mode 100644
index 755eb06..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/linkHelper.htm
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Navigator Link Helper</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Navigator Link Helper</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.ui.views.navigator.linkHelper<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]<p>
-An action's enablement and/or visibility can be defined using the elements <samp>enablement</samp> and <samp>visibility</samp> respectively. These two elements contain a boolean expression that is evaluated to determine the enablement and/or visibility.
-<p>
-The syntax is the same for the <samp>enablement</samp> and <samp>visibility</samp> elements. Both contain only one boolean expression sub-element. In the simplest case, this will be an <samp>objectClass</samp>, <samp>objectState</samp>, <samp>pluginState</samp>, or <samp>systemProperty</samp> element. In the more complex case, the <samp>and</samp>, <samp>or</samp>, and <samp>not</samp> elements can be combined to form a boolean expression. Both the <samp>and</samp>, and <samp>or</samp> elements must contain 2 sub-elements. The <samp>not</samp> element must contain only 1 sub-element.
-</p></p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.linkHelper">linkHelper</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.linkHelper">linkHelper</a> (<a href="#e.editorInputEnablement">editorInputEnablement</a> , <a href="#e.selectionEnablement">selectionEnablement</a>?)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST linkHelper</p>
-<p class=code id=dtdAttlist>class&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>class</b> - </li>
-<li><b>id</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.editorInputEnablement">editorInputEnablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.selectionEnablement">selectionEnablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST selectionEnablement</p>
-<p class=code id=dtdAttlist>navigatorContentExtensionId&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>navigatorContentExtensionId</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.enablement">enablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.visibility">visibility</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the visibility for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.and">and</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean AND operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.or">or</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean OR operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.not">not</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean NOT operation on the result of evaluating it's sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.objectClass">objectClass</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectClass</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>adaptable&nbsp;(true | false) &gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the class or interface of each object in the current selection. If each object in the selection implements the specified class or interface, the expression is evaluated as true.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - a fully qualified name of a class or interface.  The expression is evaluated as true only if all objects within the selection implement this class or interface.</li>
-<li><b>adaptable</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.objectState">objectState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectState</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the attribute state of each object in the current selection. If each object in the selection has the specified attribute state, the expression is evaluated as true. To evaluate this type of expression, each object in the selection must implement, or adapt to, <samp>org.eclipse.ui.IActionFilter</samp> interface.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of an object's attribute. Acceptable names reflect the object type, and should be publicly declared by the plug-in where the object type is declared.</li>
-<li><b>value</b> - the required value of the object's attribute. The acceptable values for the object's attribute should be publicly declared.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.pluginState">pluginState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST pluginState</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;(installed|activated) "installed"&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of a plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - the identifier of a plug-in which may or may not exist in the plug-in registry.</li>
-<li><b>value</b> - the required state of the plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.systemProperty">systemProperty</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST systemProperty</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of some system property.  The property value is retrieved from the <samp>java.lang.System</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of the system property.</li>
-<li><b>value</b> - the required value of the system property.</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/navigatorContent.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/navigatorContent.htm
deleted file mode 100644
index e1bc426..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/navigatorContent.htm
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>navigatorContent</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>navigatorContent</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.wst.common.navigator.views.navigatorContent<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]<p>
-An action's enablement and/or visibility can be defined using the elements <samp>enablement</samp> and <samp>visibility</samp> respectively. These two elements contain a boolean expression that is evaluated to determine the enablement and/or visibility.
-<p>
-The syntax is the same for the <samp>enablement</samp> and <samp>visibility</samp> elements. Both contain only one boolean expression sub-element. In the simplest case, this will be an <samp>objectClass</samp>, <samp>objectState</samp>, <samp>pluginState</samp>, or <samp>systemProperty</samp> element. In the more complex case, the <samp>and</samp>, <samp>or</samp>, and <samp>not</samp> elements can be combined to form a boolean expression. Both the <samp>and</samp>, and <samp>or</samp> elements must contain 2 sub-elements. The <samp>not</samp> element must contain only 1 sub-element.
-</p><p>
-An action's enablement and/or visibility can be defined using the elements <samp>enablement</samp> and <samp>visibility</samp> respectively. These two elements contain a boolean expression that is evaluated to determine the enablement and/or visibility.
-<p>
-The syntax is the same for the <samp>enablement</samp> and <samp>visibility</samp> elements. Both contain only one boolean expression sub-element. In the simplest case, this will be an <samp>objectClass</samp>, <samp>objectState</samp>, <samp>pluginState</samp>, or <samp>systemProperty</samp> element. In the more complex case, the <samp>and</samp>, <samp>or</samp>, and <samp>not</samp> elements can be combined to form a boolean expression. Both the <samp>and</samp>, and <samp>or</samp> elements must contain 2 sub-elements. The <samp>not</samp> element must contain only 1 sub-element.
-</p></p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.navigatorContent">navigatorContent</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.navigatorContent">navigatorContent</a> (<a href="#e.enables">enables</a> , <a href="#e.emfEnablement">emfEnablement</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST navigatorContent</p>
-<p class=code id=dtdAttlist>contentProvider&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>labelProvider&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>actionProvider&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>openListener&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>priority&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lowest|lower|low|normal|high|higher|highest) <p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>enabledByDefault&nbsp;(true | false) <p class=code id=dtdAttlist>icon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>sorter&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-The root element of the extension schema. Defines information used by the Common Navigator to find available extensions.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>contentProvider</b> - Supplies the name of a class which implements org.eclipse.jface.viewers.ITreeContentProvider or org.eclipse.wst.common.navigator.views.INavigatorContentProvider.</li>
-<li><b>labelProvider</b> - Supplies the name of a class which implements org.eclipse.jface.viewers.ILabelProvider or org.eclipse.wst.common.navigator.views.ICommonLabelProvider.</li>
-<li><b>actionProvider</b> - Supplies the name of a class that implements org.eclipse.wst.common.navigator.views.ICommonActionProvider.</li>
-<li><b>id</b> - A unique ID to identify this extension. Used for extension activation and by other extensions that would like to extend the defined extension (e.g. add another ICommonActionProvider)</li>
-<li><b>openListener</b> - Supplies the name of a class that implements org.eclipse.jface.views.OpenListener or org.eclipse.wst.common.navigator.views.ICommonOpenListener.</li>
-<li><b>priority</b> - Indicates the relative priority of this extension to other extensions. Used by the Common Navigator to handle sorting and organization of the contributed content from this extension in relation to content from other extensions. Defaults to "normal"</li>
-<li><b>name</b> - Specify a display name for the Content Extension</li>
-<li><b>enabledByDefault</b> - Indicates whether the current extension will be enabled by default. True will enable the extension, False will disable the extension. Users can later choose to override this value.</li>
-<li><b>icon</b> - A plugin-relative path to an icon for use when displaying the metadata about the content extension to the user.</li>
-<li><b>sorter</b> - Indicates the name of class which implements java.util.Comparator that knows how to sort the items supported by this extension. If the extension enables on types that it does not provide, but understands, it may be called upon to sort items that it did not contribute.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.enables">enables</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension. 
-Objects which are accepted by the expression will cause the extension to be invoked.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.enablement">enablement</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.visibility">visibility</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the visibility for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.and">and</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean AND operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.or">or</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean OR operation on the result of evaluating it's two sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.not">not</a> (<a href="#e.and">and</a> | <a href="#e.or">or</a> | <a href="#e.not">not</a> | <a href="#e.objectClass">objectClass</a> | <a href="#e.objectState">objectState</a> | <a href="#e.pluginState">pluginState</a> | <a href="#e.systemProperty">systemProperty</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element represent a boolean NOT operation on the result of evaluating it's sub-element expressions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.objectClass">objectClass</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectClass</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>adaptable&nbsp;(true | false) &gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the class or interface of each object in the current selection. If each object in the selection implements the specified class or interface, the expression is evaluated as true.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - a fully qualified name of a class or interface.  The expression is evaluated as true only if all objects within the selection implement this class or interface.</li>
-<li><b>adaptable</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.objectState">objectState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectState</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the attribute state of each object in the current selection. If each object in the selection has the specified attribute state, the expression is evaluated as true. To evaluate this type of expression, each object in the selection must implement, or adapt to, <samp>org.eclipse.ui.IActionFilter</samp> interface.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of an object's attribute. Acceptable names reflect the object type, and should be publicly declared by the plug-in where the object type is declared.</li>
-<li><b>value</b> - the required value of the object's attribute. The acceptable values for the object's attribute should be publicly declared.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.pluginState">pluginState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST pluginState</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;(installed|activated) "installed"&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of a plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - the identifier of a plug-in which may or may not exist in the plug-in registry.</li>
-<li><b>value</b> - the required state of the plug-in. The state of the plug-in may be one of the following: <samp>installed</samp> or <samp>activated</samp>.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.systemProperty">systemProperty</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST systemProperty</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>value&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to evaluate the state of some system property.  The property value is retrieved from the <samp>java.lang.System</samp>.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - the name of the system property.</li>
-<li><b>value</b> - the required value of the system property.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.emfEnablement">emfEnablement</a> (<a href="#e.package">package</a>+)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-This element is used to define the enablement for the extension.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.package">package</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST package</p>
-<p class=code id=dtdAttlist>uri&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>uri</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/navigatorViewer.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/navigatorViewer.htm
deleted file mode 100644
index f5d8b23..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/navigatorViewer.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>navigatorViewer</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>navigatorViewer</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.wst.common.navigator.views.navigatorViewer<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.navigatorViewer">navigatorViewer</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.navigatorViewer">navigatorViewer</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST navigatorViewer</p>
-<p class=code id=dtdAttlist>rootContentExtensionId&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>viewerId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>popupMenuId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-Used to associate one or more extensions with a particular viewer id. This extension is not required for those who just want a basic Common Navigator instance, but can be useful for clients who are creating a logical viewer.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>rootContentExtensionId</b> - Specify the ID of a Content Extension that will be used to provide content for the viewer instance. This ID must correspond to the ID of a navigatorContent extension point.</li>
-<li><b>viewerId</b> - An ID that corresponds to an org.eclipse.ui.views extension point that defines an instance or subclass of org.eclipse.wst.common.navigator.CommonNavigator.</li>
-<li><b>popupMenuId</b> - A custom popupMenuId to use for extensions that wish to contribute to the view ID. The default value is specified by NavigatorViewerDescriptor.DEFAULT_POPUPMENU_ID</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/schema.css b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/schema.css
deleted file mode 100644
index 00f9d01..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/schema.css
+++ /dev/null
@@ -1,66 +0,0 @@
-H6.CaptionFigColumn#header {
-	font-size:16px; 
-	display:inline
-}
-
-P.Note#copyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#dtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-P.Code#dtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
-}
-
-P.Code#tag {
-	color: #000080; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#cstring {
-	color: #008000; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;	
-}
-
-.ConfigMarkup#elementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-.ConfigMarkup#attlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
-}
-
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/thirdPartyFilterProvider.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/thirdPartyFilterProvider.htm
deleted file mode 100644
index 625b573..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/thirdPartyFilterProvider.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Unbenanntes Dokument</title>
-</head>
-
-<body>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/validationSelectionHandler.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/validationSelectionHandler.htm
deleted file mode 100644
index d5a43e1..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/validationSelectionHandler.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>validationSelectionHandler</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>validationSelectionHandler</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.wst.common.frameworks.validationSelectionHandler<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>[Enter the first release in which this extension point appears.]
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>[Enter description of this extension point.]</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.validationSelectionHandler">validationSelectionHandler</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.validationSelectionHandler">validationSelectionHandler</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST validationSelectionHandler</p>
-<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>handlerClass&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>selectionType&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>id</b> - </li>
-<li><b>handlerClass</b> - </li>
-<li><b>selectionType</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/wizardPageGroup.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/wizardPageGroup.htm
deleted file mode 100644
index 9f46c57..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/wizardPageGroup.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Edit Model Editor</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>Edit Model Editor</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.etools.emf.workbench.ui.editModelEditor<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>6.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>Edit model editors represent the multi page editors that can be used to edit a collection of EMF resources.  By declaring an edit model editor, the plugin provider allows the framework to generically obtain the edit model used by the editor.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> ((<a href="#e.wizardPageGroup">wizardPageGroup</a>))&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.wizardPageGroup">wizardPageGroup</a> ((<a href="#e.factory">factory</a>))&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST wizardPageGroup</p>
-<p class=code id=dtdAttlist>wizardID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>allowsExtendedPagesAfter&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>pageGroupInsertionID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>pageGroupID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>wizardID</b> - This must match the id defined in the extendableWizard element in the extendableWizard extension point</li>
-<li><b>allowsExtendedPagesAfter</b> - </li>
-<li><b>pageGroupInsertionID</b> - If this page is to immediately after another page, this must match the pageID of the page to insert after.</li>
-<li><b>pageGroupID</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.factory">factory</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST factory</p>
-<p class=code id=dtdAttlist>className&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>className</b> - This class is an instancof com.ibm.wtp.common.ui.wizard.extensions.WizardExtensionFactory</li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>[Enter extension point usage example here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>API Information: </h6>[Enter API information here.]
-<p></p>
-
-<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/wtpuiAction.htm b/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/wtpuiAction.htm
deleted file mode 100644
index 21e9a9b..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/Schemas/wtpuiAction.htm
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>WTP UI Operation</title>
-<link rel="stylesheet" type="text/css" href="schema.css">
-</HEAD>
-<BODY>
-<H1><CENTER>WTP UI Operation</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>com.ibm.wtp.common.ui.WTPUIOperation<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>6.0.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>This extension point is for WTP Operations which need to be tied to a generic UI action, such as CUT, COPY, PASTE, DELETE, and RENAME.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> ((<a href="#e.masterOperation">masterOperation</a> | <a href="#e.slaveOperation">slaveOperation</a>))&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.masterOperation">masterOperation</a> (<a href="#e.selectionEnablement">selectionEnablement</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST masterOperation</p>
-<p class=code id=dtdAttlist>extendedGenericId&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>operationClass&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>populatorClass&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>alwaysExecute&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>overrideId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-A masterOperation enables an existing WTP Operation to be used in a UI action. Generic Ids aggregate a set of masterOperations for the same Abstract action (like a "CUT" operation). WTP Operations are themselves extendible, so for any masterOperation defined, there may be any number of pre|post operations. These pre|post operation can have slaveOperation elements defined which indicate the pre|post operation may be run independently.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>extendedGenericId</b> - The ID of the Generic Action you would like to contribute to. (e.g. The id for CUT, COPY, PASTE, DELETE, RENAME).</li>
-<li><b>operationClass</b> - The fully qualified class of your operation. Your operation must extend com.ibm.wtp.common.operation.WTPOperation and must provide a no-arguments default constructor. If this attribute is not provided, the getDefaultOperation() returned by the dataModel will be used.</li>
-<li><b>name</b> - A name to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.</li>
-<li><b>description</b> - A description to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.</li>
-<li><b>populatorClass</b> - An implementation of com.ibm.wtp.common.operation.extension.ui.WTPOperationDataModelUICreator. The populatorClass knows how to provide a WTP Operation Data Model based on a given selection. The getDefaultOperation() method of the data model will be ignored if the operationClass is provided.</li>
-<li><b>alwaysExecute</b> - </li>
-<li><b>overrideId</b> - </li>
-<li><b>id</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.selectionEnablement">selectionEnablement</a> (<a href="#e.objectClass">objectClass</a> | <a href="#e.or">or</a>)&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-The selectionEnablement element allows you to filter which kinds of selection your object is applicable to using Standard Eclipse Action Expresions.</p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.slaveOperation">slaveOperation</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST slaveOperation</p>
-<p class=code id=dtdAttlist>operationClass&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>description&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-The slaveOperation element defines display information for operations which extend a declared master operation. If a pre|post operation of a master does not have a corresponding slaveOperation element, then the pre|post operation will be consider required, and not be displayed to the user.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>operationClass</b> - The fully qualified class of your operation. Your operation must extend com.ibm.wtp.common.operation.WTPOperation and must provide a no-arguments default constructor. For slave operations, the data model of the master operation will be provided. Therefore, slaves cannot override the data model using a seperate populatorClass.</li>
-<li><b>name</b> - A name to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.</li>
-<li><b>description</b> - A description to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.or">or</a> (<a href="#e.objectClass">objectClass</a> | <a href="#e.and">and</a> | <a href="#e.objectState">objectState</a>)&gt;</p>
-<p></p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.objectClass">objectClass</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectClass</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>adaptable&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - </li>
-<li><b>adaptable</b> - </li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.and">and</a> (<a href="#e.objectClass">objectClass</a> | <a href="#e.or">or</a>)&gt;</p>
-<p></p>
-<br><br>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.objectState">objectState</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST objectState</p>
-<p class=code id=dtdAttlist>value&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>value</b> - </li>
-<li><b>name</b> - </li>
-</ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>The following example declares two Master Operations (<code>com.acme.ui.operation.MasterOperationA</code> and <code>com.acme.ui.operation.MasterOperationB</code>) which are attached to the Generic ID <code>com.acme.ui.WTPOptionalOperationTest</code>. 
-The scenario has Master A which has as a pre-operation of Slave A and a post-operation of Slave C. Slave A is made optional by the <code>slaveOperation</code> element, while Slave C will always be run (no <code>slaveOperation</code> is given to run it seperately). Slave A further has an optional pre-operation (Slave B) that can be executed indepently of either Slave A or Master A.
-<pre>
-   <p class=code id=tag>&lt;extension
-         point=<p class=code id=cstring>&quot;com.ibm.wtp.common.ui.wtpuiAction&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;masterOperation
-            populatorClass=<p class=code id=cstring>&quot;com.acme.ui.operation.AcmeOperationPopulator&quot;</p><p class=code id=tag>
-            name=<p class=code id=cstring>&quot;%master_a_name&quot;</p><p class=code id=tag>
-            operationClass=<p class=code id=cstring>&quot;com.acme.ui.operation.MasterOperationA&quot;</p><p class=code id=tag>
-            extendedGenericId=<p class=code id=cstring>&quot;com.acme.ui.WTPOptionalOperationTest&quot;</p><p class=code id=tag>
-            description=<p class=code id=cstring>&quot;%master_a_description&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/masterOperation&gt;</p> 
-   <p class=code id=tag>&lt;slaveOperation
-            name=<p class=code id=cstring>&quot;Slave A&quot;</p><p class=code id=tag>
-            operationClass=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationA&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/slaveOperation&gt;</p> 
-      <p class=code id=tag>&lt;slaveOperation
-            name=<p class=code id=cstring>&quot;Slave B&quot;</p><p class=code id=tag>
-            operationClass=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationB&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/slaveOperation&gt;</p>      
-      <p class=code id=tag>&lt;masterOperation
-            populatorClass=<p class=code id=cstring>&quot;com.acme.ui.operation.AcmeOperationPopulator&quot;</p><p class=code id=tag>
-            name=<p class=code id=cstring>&quot;EAR Project Action&quot;</p><p class=code id=tag>
-            operationClass=<p class=code id=cstring>&quot;com.acme.ui.operation.MasterOperationB&quot;</p><p class=code id=tag>
-            extendedGenericId=<p class=code id=cstring>&quot;com.acme.ui.WTPOptionalOperationTest&quot;</p><p class=code id=tag>&gt;</p>
-            <p class=code id=tag>&lt;selectionEnablement&gt;</p> 
-             <p class=code id=tag>&lt;objectState name=<p class=code id=cstring>&quot;projectNature&quot;</p><p class=code id=tag> value=<p class=code id=cstring>&quot;org.eclipse.jst.j2ee.EARNature&quot;</p><p class=code id=tag> /&gt;</p>
-            <p class=code id=tag>&lt;/selectionEnablement&gt;</p>
-      <p class=code id=tag>&lt;/masterOperation&gt;</p>   
-   <p class=code id=tag>&lt;/extension&gt;</p>
-</pre>   
-
-For each of the slaveOperations referenced above, you must have a corresponding WTP Operation Extension declared similar to the following:
- 
-<pre> 
-   <p class=code id=tag>&lt;extension
-         id=<p class=code id=cstring>&quot;wtpuiAciton.Acme.Extensions&quot;</p><p class=code id=tag>
-         point=<p class=code id=cstring>&quot;com.ibm.wtp.common.ExtendableOperation&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;extendableOperation
-            class=<p class=code id=cstring>&quot;com.acme.ui.operation.MasterOperationA&quot;</p><p class=code id=tag>
-            id=<p class=code id=cstring>&quot;com.acme.ui.operation.MasterOperationA&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/extendableOperation&gt;</p>
-      <p class=code id=tag>&lt;extendableOperation
-            class=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationA&quot;</p><p class=code id=tag>
-            id=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationA&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/extendableOperation&gt;</p>
-   <p class=code id=tag>&lt;/extension&gt;</p>
-   <p class=code id=tag>&lt;extension
-         point=<p class=code id=cstring>&quot;com.ibm.wtp.common.OperationExtension&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;!-- Made optional by the above declaration --&gt;</p>
-      <p class=code id=tag>&lt;operationExtension
-            preOperationClass=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationA&quot;</p><p class=code id=tag>
-            id=<p class=code id=cstring>&quot;com.acme.ui.operation.MasterOperationA&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/operationExtension&gt;</p> 
-      <p class=code id=tag>&lt;!-- Made optional by the above declaration --&gt;</p>
-      <p class=code id=tag>&lt;operationExtension
-            postOperationClass=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationB&quot;</p><p class=code id=tag>
-            id=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationA&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/operationExtension&gt;</p>   
-      <p class=code id=tag>&lt;!-- Non-optional operation, will always run --&gt;</p>
-      <p class=code id=tag>&lt;operationExtension
-            postOperationClass=<p class=code id=cstring>&quot;com.acme.ui.operation.SlaveOperationC&quot;</p><p class=code id=tag>
-            id=<p class=code id=cstring>&quot;com.acme.ui.operation.MasterOperationA&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/operationExtension&gt;</p>  
-   <p class=code id=tag>&lt;/extension&gt;</p> 
-</pre>
-
-In general, users extending existing actions only need to declare the following: 
-<pre>
- <p class=code id=tag>&lt;extension
-         point=<p class=code id=cstring>&quot;com.ibm.wtp.common.OperationExtension&quot;</p><p class=code id=tag>&gt;</p> 
- <p class=code id=tag>&lt;!-- The action referenced must be declared as extensible by the   com.ibm.wtp.common.ExtendableOperation extension point --&gt;</p>         
-      <p class=code id=tag>&lt;operationExtension
-            preOperationClass=<p class=code id=cstring>&quot;...YOUR CLASS...&quot;</p><p class=code id=tag>            
-            id=<p class=code id=cstring>&quot;...ID OF EXISTING OPERATION...&quot;</p><p class=code id=tag>&gt;</p> 
-      <p class=code id=tag>&lt;/operationExtension&gt;</p> 
- <p class=code id=tag>&lt;/extension&gt;</p>      
-</pre>      
-
-And if your operation is optional declare the slaveOperation:
-
-<pre> 
-   <p class=code id=tag>&lt;extension
-         point=<p class=code id=cstring>&quot;com.ibm.wtp.common.ui.wtpuiAction&quot;</p><p class=code id=tag>&gt;</p> 
-   <p class=code id=tag>&lt;slaveOperation
-            name=<p class=code id=cstring>&quot;..NAME OF YOUR OPERATION...&quot;</p><p class=code id=tag>
-            description=<p class=code id=cstring>&quot;...DESCRIPTION OF YOUR ACTION...&quot;</p><p class=code id=tag>
-            operationClass=<p class=code id=cstring>&quot;...YOUR CLASS...&quot;</p><p class=code id=tag>&gt;</p>
-      <p class=code id=tag>&lt;/slaveOperation&gt;</p> 
-   <p class=code id=tag>&lt;/extension&gt;</p>      
-</pre>
-<p></p>
-
-<br>
-<p class=note id=copyright>
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.common.navigator.views.html b/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.common.navigator.views.html
deleted file mode 100644
index 3f750e8..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.common.navigator.views.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>org.eclipse.wst.common.navigator.views</title>
-<link rel="stylesheet" type="text/css" href="../sources/formate.css">
-</head>
-
-<body>
-<h1 class="descriptions">org.eclipse.common.navigator.views</h1>
-<p>Version 0.7.0</p>
-<p class="schema">Dependencies (Required Plugins)</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	org.eclipse.jface<br>
-	org.eclipse.ui.workbench<br>
-	org.eclipse.core.resources<br>
-	org.eclipse.ui.ide<br>
-	org.eclipse.core.runtime<br>
-	org.eclipse.ui<br>
-	org.eclipse.emf.ecore<br>
-	org.eclipse.emf.edit<br>
-	org.eclipse.wst.common.ui.properties
-	</td>
-  </tr>
-</table>
-
-<p class="schema">Extensions</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	org.eclipse.ui.dropActions
-	</td>
-  </tr>
-</table>
-<p class="schema">Extension Points</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	<a href="Schemas/navigatorContent.htm">navigatorContent</a><br>
-	<a href="Schemas/navigatorViewer.htm">navigatorViewer</a><br>
-	<a href="Schemas/commonFilter.htm">commonFilter</a><br>
-	<a href="Schemas/dropHandler.htm">dropHandler</a><br>
-	thirdPartyFilterProvider<br>
-	<a href="Schemas/linkHelper.htm">linkHelper</a><br>
-	<a href="Schemas/actionProvider.htm">actionProvider</a>	</td>
-  </tr>
-</table>
-<p class="schema">Schema</p>
-not available
-</body>
-</html>
-
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.emf.html b/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.emf.html
deleted file mode 100644
index 9d6e43a..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.emf.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>org.eclipse.wst.common.emf</title>
-<link rel="stylesheet" type="text/css" href="../sources/formate.css">
-</head>
-<body>
-<h1 class="description">org.eclipse.wst.common.emf</h1>
-<p>Version: 0.7.0 </p>
-<p class="schema">Dependencies (Required Plug Ins) </p>
-
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>org.eclipse.emf.ecore.xmi<br>
-	org.eclipse.wst.common.frameworks<br>
-	org.eclipse.core.runtime<br>
-	org.eclipse.core.resources<br>
-	org.eclipse.jem.util</td>
-  </tr>
-</table>
-<p class="schema">Extensions:</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>org.eclipse.wst.common.emf.packageURIMap<br>
-    org.eclipse.jem.util.uiContextSensetiveClass</td>
-  </tr>
-</table>
-<p class="schema">Extension Points:</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>packageURIMap
-    </td>
-  </tr>
-</table>
-<p class="schema">Schema:</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>not documentated</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.emfworkbench.integration.html b/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.emfworkbench.integration.html
deleted file mode 100644
index e26c98b..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.emfworkbench.integration.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>org.eclipse.wst.common.emfworkbench.integration</title>
-<link rel="stylesheet" type="text/css" href="../sources/formate.css">
-</head>
-
-<body>
-<h1 class="descriptions">org.eclipse.wst.common.emfworkbench.integration</h1>
-<p>Version 0.7.0</p>
-<p class="schema">Dependencies (Required Plug Ins) </p>
-
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-		org.eclipse.wst.common.frameworks<br>
-     	org.eclipse.jem.util<br>
-	    org.eclipse.emf.edit<br>
-		org.eclipse.emf.ecore.xmi<br>
-		org.eclipse.wst.common.emf<br>
-		org.eclipse.core.runtime<br>
-	    org.eclipse.core.resources<br>
-		org.eclipse.emf.codegen<br>
-		org.eclipse.emf.codegen.ecore<br>
-		org.eclipse.xsd<br>
-		org.eclipse.emf.importer.java
-    </td>
-  </tr>
-</table>
-<p class="Stil2"><span class="schema">Extensions</span>:</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>org.eclipse.jem.util.internalWorkbenchContextFactory<br>
-    	org.eclipse.jem.util.uiContextSensetiveClass<br>
-		org.eclipse.core.runtime.applications<br>
-		org.eclipse.wst.common.frameworks.validationSelectionHandler		
-	</td>
-  </tr>
-</table>
-<p class="schema">Extension Points:</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td><a href="Schemas/EMFRessourceEditModel.htm">editModel</a><br>
-		<a href="Schemas/EditModelExtension.htm">editModelExtension</a><br>
-		<a href="Schemas/AdapterFactoryExtension.htm">adapterFactory</a><br>
-	<a href="Schemas/ModifierHelperFactory.htm">ModifierHelperFactory</a>    </td>
-  </tr>
-</table>
-</body>
-</html>
-
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.frameworks.html b/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.frameworks.html
deleted file mode 100644
index 719496e..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.frameworks.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>org.eclipse.wst.common.feature</title>
-<link rel="stylesheet" type="text/css" href="../sources/formate.css">
-</head>
-
-<body>
-<h1 class="descriptions">org.eclipse.wst.common.frameworks</h1>
-<p>Version 0.7.0</p>
-<p class="schema">Dependencies (Required Plugins)</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	org.eclipse.core.resources<br>
-	org.eclipse.core.runtime<br>
-	org.eclipse.emf.core.commands<br>
-	org.eclipse.jem.util</td>
-  </tr>
-</table>
-
-<p class="schema">Extensions</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-    org.eclipse.jem.util.uiContextSensetiveClass</td>
-  </tr>
-</table>
-<p class="schema">Extension Points</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td><a href="Schemas/ExtendabledOperation.htm">ExtendableOperation</a><br>
-		<a href="Schemas/OperationExtension.htm">OperationExtension</a><br>
-		<a href="Schemas/FunctionGroup.htm">functionGroup</a><br>
-		<a href="Schemas/WTPActivityBridge.htm">WTPActivityBridgeHelper</a><br>
-		<a href="Schemas/validationSelectionHandler.htm">validationSelectionHandler</a><br>
-	    <a href="Schemas/DataModelProvider.htm">DataModelProviderExtension</a></td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.frameworks.ui.html b/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.frameworks.ui.html
deleted file mode 100644
index 504022f..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.frameworks.ui.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>org.eclipse.wst.common.feature</title>
-<link rel="stylesheet" type="text/css" href="../sources/formate.css">
-</head>
-
-<body>
-<h1 class="descriptions">org.eclipse.wst.common.frameworks.ui</h1>
-<p>Version 0.7.0</p>
-<p class="schema">Dependencies (Required Plugins)</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	org.eclipse.ui.ide<br>
-	org.eclipse.core.resources<br>
-	org.eclipse.ui<br>
-	org.eclipse.wst.common.frameworks<br>
-	org.eclipse.core.runtime<br>
-	org.eclipse.jem.util</td>
-  </tr>
-</table>
-
-<p class="schema">Extensions</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	oeg.eclipse.jem.util.uiTester<br>
-    org.eclipse.jem.util.uiContextSensetiveClass<br>
-	org.eclipse.wst.common.frameworks.WTPActivityBridgeHelper<br>
-	org.eclipse.wst.common.frameworks.ExtendableOperation<br>
-	org.eclipse.ui.preferencePages
-	</td>
-  </tr>
-</table>
-<p class="schema">Extension Points</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	<a href="Schemas/wtpuiAction.htm">wtpuiAction</a><br>
-	<a href="Schemas/extendedViewer.htm">extendedViewer</a><br>
-	<a href="Schemas/extendableWizard.htm">extendableWizard</a><br>
-	<a href="Schemas/wizardPageGroup.htm">wizardPageGroup</a><br>
-	<a href="Schemas/DataModelWizardExtension.htm">DataModelWizardExtension</a>	</td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.modeulecore.html b/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.modeulecore.html
deleted file mode 100644
index 167f462..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/descriptions/org.eclipse.wst.common.modeulecore.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>org.eclipse.wst.common.feature</title>
-<link rel="stylesheet" type="text/css" href="../sources/formate.css">
-</head>
-
-<body>
-<h1 class="descriptions">org.eclipse.wst.common.modeulecore</h1>
-<p>Version 0.7.0</p>
-<p class="schema">Dependencies (Required Plugins)</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	org.eclipse.core.runtime<br>
-	org.eclipse.wst.common.frameworks<br>
-	org.eclipse.core.resources<br>
-	org.eclipse.emf.core<br>
-	org.eclipse.wst.common.emfworkbench.integration<br>
-	org.eclipse.wst.common.emf<br>
-	org.eclipse.emf.ecore.xmi<br>
-	org.eclipse.wst.server.core<br>
-	org.eclipse.core.commands<br>
-	org.eclipse.emf.rdit<br>
-	org.eclipse.ui<br>
-	org.eclipse.jem.util<br>
-	org.eclipse.wst.common.uriresolver</td>
-  </tr>
-</table>
-
-<p class="schema">Extensions</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	org.eclipse.emf.ecore.generated_package<br>
-	org.eclipse.core.resources.natures<br>
-	org.eclipse.wst.common.emfworkbench.integration.editModel<br>
-	org.eclipse.core.resources.builders<br>
-	org.eclipse.wst.common.frameworks.DataModelProviderExtension<br>
-	org.eclipse.core.runtime.contentTypes<br>
-	org.eclipse.team.core.ignore<br>
-	org.eclipse.wst.common.uriresolver.resolverExtensions
-	</td>
-  </tr>
-</table>
-<p class="schema">Extension Points</p>
-<table width="90%"  border="0" cellspacing="0">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td>
-	artifactedit</td>
-  </tr>
-</table>
-<p class="schema">Schema</p>
-not available
-</body>
-</html>
-
diff --git a/docs/org.eclipse.wst.doc.isv/html/eclipse_scanner.html b/docs/org.eclipse.wst.doc.isv/html/eclipse_scanner.html
deleted file mode 100644
index ed745ee..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/eclipse_scanner.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta
-  http-equiv="Content-Type"
-  content="text/html; charset=iso-8859-1">
-
-<title>Eclipse API Scanner</title>
-
-<link
-  rel="stylesheet"
-  type="text/css"
-  href="sources/formate.css">
-</head>
-<body>
-<p class="ueberschrift">Introduction</p>
-<p>This document summarizes the usage of the Eclipse API scanner. The
-goal of the Eclipse API scanner is to identify any internal API
-references in any Eclipse-based products. You can view the requirements
-document <a href="scanner_req.html">here</a>, and the design document <a
-  href="scanner_doc.html">here</a>.</p>
-<p class="ueberschrift">Downloading and running the Eclipse API scanner</p>
-<p>A binary version of the Eclipse API scanner is available here:</p>
-<a
-  href="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/apiscanner.zip">Download
-the Eclipse API scanner</a>
-.
-<p>The source of the Eclipse API scanner is also available in CVS: <i>(http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.wtp.releng/apitools/?cvsroot=WebTools_Project)</i>.</p>
-Check out the
-<b>org.eclipse.wtp.releng.tools.component.core</b>
-project and the
-<b>org.eclipse.wtp.releng.tools.component.ui</b>
-project.
-<p>Running the Eclipse API scanner from the command line environment</p>
-<p>Before running the Eclipse API scanner, you should get yourself
-familiar with what is a component. For a definition of component, visit
-the <a href="scanner_doc.html">design document</a>. To begin, have your
-Eclipse components/plug-ins and your component.xml files ready. The
-Eclipse API scanner will scan all the API references in each component
-and check whether they are internal API references. An API violation
-report will be generated for each component. To generate the API
-violation reports, run:</p>
-<pre>
-genViolation.bat -eclipseDir &lt;eclipseDir&gt; -compXMLDir &lt;compXMLDir&gt; -compRefDir &lt;compRefDir&gt; -compVioDir &lt;compVioDir&gt; -genHTML -debug
-
-</pre>
-where:
-<ul>
-
-  <li><b>eclipseDir</b> - a space separated list of directories
-  containing the plug-ins for your product. These directories do not
-  have to include the base Eclipse plug-ins (ex: org.eclipse.jdt.core).
-  You only need the plug-ins that you want to generate API violation
-  reports for.</li>
-
-  <li><b>compXMLDir</b> - a space separated list of directories
-  containing component.xml files for your product. The Eclipse API
-  scanner will generate an API violation report for each component.xml
-  found in these directories. So, if you do not want to generate
-  violation reports for the Eclipse components (ex:
-  org.eclipse.jdt.core), do not include their component.xml files here.</li>
-
-  <li><b>compRefDir</b> - a space separated list of directories
-  containing component.xml files that your product/components depend on.
-  For example, the component.xml files for org.eclipse.jdt.core goes
-  here.</li>
-
-  <li><b>compVioDir</b> - the output directory of the API violation
-  reports.</li>
-
-  <li><b>genHTML</b> - generates the API violation report in HTML
-  (default is XML format).</li>
-
-
-  <li><b>debug</b> - generates debug information (ex: line numbers).</li>
-
-</ul>
-For a list of all the options available, simply run genViolation.bat
-without any arguments. Note that genViolation.bat uses relative paths.
-Therefore, if you want to run it out-of-the-box, we must "cd" to
-genViolation.bat's directory before running it. Other options include:
-<ul>
-
-  <li><b>include</b> - a space separated list of package names to be
-  included in the scan.</li>
-
-  <li><b>exclude</b> - a space separated list of package names to be
-  excluded in the scan. For example, if you specify "java.lang. sun.",
-  then the API violation report will not include internal API references
-  to those two packages.</li>
-
-  <li><b>genAPI</b> - generates a component-api.xml file per component.
-  This file lists all the public APIs that a component has.</li>
-
-  <li><b>genUsage</b> - generates a component-use.xml file per
-  component. This file lists all the API references that a component
-  has.</li>
-
-
-  <li><b>classRefOnly</b> - treats all API references as class
-  reference. By default, the Eclipse API scanner will categorize API
-  references into different categories such as class references, method
-  references, field references and etc. By specifying this option, all
-  API references are consider class references. This speeds up the
-  scanning process.</li>
-
-</ul>
-
-<p></p>
-<p>To get you started more quickly, you can use <b>genComponent.bat</b>
-to generate a component.xml file per plugin. Any packages with the word
-"internal" in it will be excluded from the generated component.xml file.
-To generate default component.xml files, run:</p>
-<pre>
-genComponent.bat -eclipseDir &lt;eclipseDir&gt; -compXMLDir &lt;compXMLDir&gt;
-</pre>
-where:
-<ul>
-
-  <li><b>eclipseDir</b> - a space separated list of directories
-  containing the plug-ins for your product. Again, do not include base
-  Eclipse plug-ins in here.</li>
-
-
-  <li><b>compXMLDir</b> - the output directory of the generated
-  component.xml files.</li>
-
-</ul>
-
-<p></p>
-<p>Running the Eclipse API scanner within Eclipse</p>
-<p>The Eclipse API scanner is also available as two Eclipse plug-ins.
-Therefore, you can overlay them on top of an Eclipse driver and use them
-to check API violations as you develop your product/plug-ins. To get
-these plug-ins, go to:</p>
-<p><a
-  href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.wtp.releng/apitools/?cvsroot=WebTools_Project">http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.wtp.releng/apitools/?cvsroot=WebTools_Project</a>
-
-</p>
-<p>and check out the <b>org.eclipse.wtp.releng.tools.component.core</b>
-project and the <b>org.eclipse.wtp.releng.tools.component.ui</b>
-project. They provide an editor for editing component.xml files.</p>
-<p><img
-  src="sources/figure01.gif"
-  alt=""></p>
-<p>They will also scan the plug-ins in your workspace and generate API
-violations in the problems views. The figure below shows a plug-in in my
-workspace called <b>org.eclipse.sample</b>. I have also created a
-component.xml file for this plugin.</p>
-<p><img
-  src="sources/figure02.gif"
-  alt=""></p>
-<p>In the next figure, I have added a reference to one of the Eclipse
-internal class. The Eclipse API scanner will flag this as an API
-violation and display it in the problems view.</p>
-<p><img
-  src="sources/figure03.gif"
-  alt=""></p>
-<p>You can find some sample component.xml files <a
-  href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.wtp.releng/apitools/components/?cvsroot=WebTools_Project">
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.wtp.releng/apitools/components/?cvsroot=WebTools_Project</a>.
-
-</p>
-<p><b>Disclaimer:</b> these sample component.xml files are provided as
-an example only. They <b>DO NOT</b> reflect the actual APIs provided by
-the Eclipse projects.</p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/description.html b/docs/org.eclipse.wst.doc.isv/html/facets/description.html
deleted file mode 100644
index eb6b2d3..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/description.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta
-  http-equiv="Content-Type"
-  content="text/html; charset=iso-8859-1">
-<title>Checking WTP out</title>
-<link
-  rel="stylesheet"
-  type="text/css"
-  href="../sources/formate.css">
-</head>
-
-<body>
-<p class="ueberschrift">Faceted Project Framework</p>
-
-<p>The Faceted Project Framework allows the plugin developer to think of 
-projects as composed of units of functionality, otherwise known as facets, that 
-can be added and removed by the user.</p>
-
-<p>Project facets are most frequently used for adding natures, builders, 
-classpath entries, and resources to a project.</p>
-
-<p>Primary Benefits</p>
-
-<ul>
-  <li>Consistent user experience.</li>
-  <li>Ability to accurately describe capabilities of the runtime platform.</li>
-</ul>
-
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/downloads/enablement-example.zip b/docs/org.eclipse.wst.doc.isv/html/facets/downloads/enablement-example.zip
deleted file mode 100644
index 03e7c89..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/downloads/enablement-example.zip
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/enabling-based-on-facets.html b/docs/org.eclipse.wst.doc.isv/html/facets/enabling-based-on-facets.html
deleted file mode 100644
index 50ce36a..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/enabling-based-on-facets.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <title>Enabling UI Elements Based on Project Facets</title>
-  <link type="text/css" rel="stylesheet" href="tutorial/tutorial.css"/>
-</head>
-
-<body>
-
-<h1 align="center">Enabling UI Elements Based on Project Facets</h1>
-
-<p>User interface elements often need to be selectively enabled based on the
-presence of a facet in a project. The two most common examples are project 
-properties pages and menu actions associated with a facet. The Faceted Project
-Framework provides a way to do that via a property tester that can be used in
-any extension point that supports the Eclipse Platform's common expression
-language.</p>
-
-<p>
-  <b>Property Name:</b> <code>org.eclipse.wst.common.project.facet.core.projectFacet</code><br/>
-  <b>Property Value:</b> <code>[facet.id](:[version.expr])?</code>
-</p>
-
-<p>As you can see from the format of the property value, you can either test
-using just the project facet id or you can also include a version expression if
-only certain versions should be matched.</p>
-
-<p>The following two examples demonstrate how the facets property tester can be
-used. To explore further, you can also download the 
-<a href="downloads/enablement-example.zip">complete runnable source</a> of these
-examples.</p>
-
-<p><b>Example 1</b></p>
-
-<p>Enables a project properties page based on the presence of a facet. Note the
-use of the <code>forcePluginActivation</code> attribute. This attribute makes
-sure that the property tester will be invoked even if the Faceted Project
-Framework plugins have not been activated yet. Omitting this attribute will cause
-the test expression to return false in that situation. Also note the use of the
-<code>adapt</code> operator to adapt the object to <code>IProject</code>. This
-is necessary as some views may represent project entities using other types. For
-instance, in the JDT's Package Explorer the projects are instances of
-<code>org.eclipse.jdt.core.IJavaProject</code>.</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="<span class="code-text">org.eclipse.ui.propertyPages</span>"&gt;
-  &lt;page
-    id="<span class="code-text">ExampleFacetPropertiesPage</span>"
-    objectClass="<span class="code-text">org.eclipse.core.resources.IProject</span>"
-    adaptable="<span class="code-text">true</span>"
-    name="<span class="code-text">Example Facet Properties</span>"
-    class="<span class="code-text">org.eclipse.wst.project.facet.examples.enablement.ExampleFacetPropertiesPage</span>"&gt;
-    &lt;enabledWhen&gt;
-      &lt;adapt type="<span class="code-text">org.eclipse.core.resources.IProject</span>"&gt;
-        &lt;test 
-          forcePluginActivation="<span class="code-text">true</span>"
-          property="<span class="code-text">org.eclipse.wst.common.project.facet.core.projectFacet</span>"
-          value="<span class="code-text">example.facet1</span>"/&gt;
-      &lt;/adapt&gt;
-    &lt;/enabledWhen&gt;          
-  &lt;/page&gt;
-&lt;/extension&gt;</pre>
-</div>
-
-<p><b>Example 2</b></p>
-
-<p>Enables a menu action if either one of the two facets specified is installed
-in a project. Note the use of a version expression to match only certain versions.</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="<span class="code-text">org.eclipse.ui.popupMenus</span>"&gt;
-  &lt;objectContribution
-    id="<span class="code-text">exampleFacetPopup</span>"
-    objectClass="<span class="code-text">org.eclipse.core.resources.IProject</span>"
-    adaptable="<span class="code-text">true</span>"&gt;
-    &lt;action
-      id="<span class="code-text">exampleFacetPopupAction</span>"
-      label="<span class="code-text">Example Facet Popup</span>"
-      class="<span class="code-text">org.eclipse.wst.project.facet.examples.enablement.ExampleFacetPopupAction</span>"
-      menubarPath="<span class="code-text">additions</span>"
-      enablesFor="<span class="code-text">+</span>"&gt;
-    &lt;/action&gt;
-    &lt;enablement&gt;
-      &lt;adapt type="<span class="code-text">org.eclipse.core.resources.IProject</span>"&gt;
-        &lt;or&gt;
-          &lt;test 
-            forcePluginActivation="<span class="code-text">true</span>"
-            property="<span class="code-text">org.eclipse.wst.common.project.facet.core.projectFacet</span>"
-            value="<span class="code-text">example.facet1:1.0</span>"/&gt;
-          &lt;test 
-            forcePluginActivation="<span class="code-text">true</span>"
-            property="<span class="code-text">org.eclipse.wst.common.project.facet.core.projectFacet</span>"
-            value="<span class="code-text">example.facet2:[1.1-2.2]</span>"/&gt;
-        &lt;/or&gt;
-      &lt;/adapt&gt;
-    &lt;/enablement&gt;
-  &lt;/objectContribution&gt;  
-&lt;/extension&gt;</pre>
-</div>
-
-<br/><br/><br/><br/>
-
-</body>
-
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/questions.html b/docs/org.eclipse.wst.doc.isv/html/facets/questions.html
deleted file mode 100644
index b48b0d9..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/questions.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <title>Questions &amp; Answers</title>
-  <link rel="stylesheet" type="text/css" href="tutorial/tutorial.css"/>
-</head>
-</head>
-
-<body>
-
-<h1 align="center">Questions &amp; Answers</h1>
-
-<p><b><a name="configure.facets.button">Question: I'd like to be able to configure my 
-facet after it is installed using the Project Facets property page or the 
-Add/Remove Facets wizard. Why isn't there a configure button?</b></p>
-
-<p><b>Answer:</b> The Project Facets property page and the Add/Remove Facets wizard
-are intended for managing the set of facets that are installed on a project. 
-When configuration of an installed facet needs to be changed, the expectation is
-that the facet author will use existing Eclipse facilities to provide project
-property pages. For example, the <code>jst.java</code> facet is configured using 
-the <i>Java Build Path</i>, <i>Java Code Style</i>, and <i>Java Compiler</i> 
-property pages.</p>
-
-<br/><br/><br/>
-
-</body>
-
-</html>
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen01.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen01.gif
deleted file mode 100644
index 6d8bfb7..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen01.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen02.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen02.gif
deleted file mode 100644
index a481aef..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen02.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen03.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen03.gif
deleted file mode 100644
index c61e29e..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen03.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen04.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen04.gif
deleted file mode 100644
index fae4b62..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen04.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen05.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen05.gif
deleted file mode 100644
index b33903e..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen05.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen06.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen06.gif
deleted file mode 100644
index 977690b..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen06.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen07.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen07.gif
deleted file mode 100644
index 3133e18..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen07.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen08.gif b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen08.gif
deleted file mode 100644
index e4040ca..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/images/screen08.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/materials/solution.zip b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/materials/solution.zip
deleted file mode 100644
index 499b7dc..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/materials/solution.zip
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/materials/starter.zip b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/materials/starter.zip
deleted file mode 100644
index bc20cab..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/materials/starter.zip
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/tutorial.css b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/tutorial.css
deleted file mode 100644
index 27036ad..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/tutorial.css
+++ /dev/null
@@ -1,120 +0,0 @@
-p, table, td, th {  font-family: arial, helvetica, geneva; font-size: 10pt}
-pre {  font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold; line-height: 14px; margin-top: 30px}
-code {  font-family: "Courier New", Courier, mono; font-size: 10pt}
-sup {  font-family: arial,helvetica,geneva; font-size: 10px}
-h3 {  font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
-li {  font-family: arial, helvetica, geneva; font-size: 10pt}
-h1 {  font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}
-body {  font-family: arial, helvetica, geneva; font-size: 10pt; clip:   rect(   ); margin-top: 5mm; margin-left: 3mm}
-.indextop { font-size: x-large;; font-family: Verdana, Arial, Helvetica, sans-serif; font-weight: bold}
-.indexsub { font-size: xx-small;; font-family: Arial, Helvetica, sans-serif; color: #8080FF}
-
-pre {
-    padding: 0px;
-    margin-top: 0px;
-    margin-left: 0px;
-    margin-bottom: 0px;
-    margin-right: 0px;
-    text-align: left;
-}
-
-.code {
- 	border: 1px dashed #3c78b5;
-    font-size: 11px;
-	font-family: Courier;
-    margin: 10px;
-	line-height: 13px;
-    text-align: left;
-    background-color: #f0f0f0;
-    padding: 10px;
-}
-
-.code-xml {
-  color: #000000;
-}
-
-.schema-type
-{
-  color: #009100;
-  background-color: inherit;
-}
-
-.schema-type-link a:link
-{
-  color: #009100;
-  text-decoration: none
-}
-
-.schema-type-link a:visited
-{
-  color: #009100;
-  text-decoration: none
-}
-
-.schema-control {
-  color: #009100;
-  font-style: italic;
-  background-color: inherit;
-}
-
-.code-text {
-  color: #009100;
-  background-color: inherit;
-}
-
-.context-code {
-  color: #767676;
-  background-color: inherit;
-}
-
-.xml-text
-{
-  color: #009100;
-}
-
-.java-code 
-{
-  color: #000000;
-}
-
-.java-comment 
-{
-  color: #009100;
-}
-
-.java-javadoc-keyword
-{
-  font-weight: bold;
-}
-
-.java-keyword
-{
-  color: #7f0055;
-  font-weight: bold;
-}
-
-.java-literal
-{
-  color: #009100;
-}
-
-.java-context
-{
-  color: #767676;
-}	
-
-.java-context-keyword
-{
-  font-weight: bold;
-}	
-
-.screen-shot 
-{
-    margin: 10px;
-}
-
-.block-indent 
-{
-    margin: 10px;
-}
diff --git a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/tutorial.html b/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/tutorial.html
deleted file mode 100644
index f22936e..0000000
--- a/docs/org.eclipse.wst.doc.isv/html/facets/tutorial/tutorial.html
+++ /dev/null
@@ -1,1287 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <title>Extending WTP Using Project Facets</title>
-  <link type="text/css" rel="stylesheet" href="tutorial.css"/>
-</head>
-
-<body>
-
-<h1 align="center">Extending WTP Using Project Facets</h1>
-
-<blockquote>
-<b>Summary</b><br/>
-The Faceted Project Framework allows the plugin developer to think of Web Tools 
-Platform (WTP) projects as composed of units of functionality, otherwise known 
-as facets, that can be added and removed by the user. This tutorial walks you 
-through an example of creating a couple of basic facets and in the process 
-covers the majority of the framework's extension points. This tutorial has been
-written for version 1.5 of the Web Tools Platform.
-<br/><br/>
-
-<b>Konstantin Komissarchik</b><br/>
-BEA Systems, Inc.<br/>
-September 5, 2006
-</blockquote>
-
-<hr width="100%">
-
-<h2>Introduction</h2>
-
-<p>Faceted Project Framework provides a powerful mechanism for extending the
-capabilities of the Web Tools Platform. Project facets are typically used as
-a way of adding functionality to a project. When a facet is added to the
-project it can perform any necessary setup actions such as copying resources, 
-installing builders, adding natures, etc. Facets can also be used as markers for
-enabling user interface elements.</p>
-
-<p>Some of the readers may be wondering how
-facets are different from the project natures which are supported by the Eclipse
-platform. Natures are designed to be hidden from user's view. They are
-essentially markers that are set behind the scenes by tooling. Project facets,
-on the other hand, have been designed from the ground up to be manipulated by
-the end users. The Faceted Project Framework provides all the necessary user 
-interface elements for managing the facets on a project and since facets
-are self describing the user is prevented from creating invalid configurations.
-Basically, it is no longer necessary to write custom project creation wizards or
-the "Enable Feature X" menu actions. Common way of managing which facets are
-installed on a project means less burden on the plugin writer and better end user
-experience.</p>
-
-<p>This tutorial covers the extension points and Java API that are used for 
-creating project facets. The reader is assumed to be already familiar with 
-developing plugins for Eclipse and to have user-level knowledge of the Web Tools 
-Platform.</p>
-
-<h2>Tutorial Scenario</h2>
-
-<p>You are a developer for a company which develops a product called
-FormGen. FormGen is basically a servlet that generates HTML forms based on XML
-definition files. The product is composed of a jar containing the servlet and
-some basic widgets. There is also an add-on jar with some extra widgets. Users
-have been manually adding the jars into the WEB-INF/lib directories of their
-web projects and setting up the servlet definitions in web.xml by hand. Your
-task is to make this setup easier by writing a couple of project facets that
-will perform these actions automatically.</p>
-
-<h2>Table of Contents</h2>
-
-<div class="block-indent">
-1. <a href="#getting.started">Getting Started</a><br/>
-2. <a href="#creating.basic.facets">Creating Basic Facet Definitions</a><br/>
-3. <a href="#specifying.constraints">Specifying Constraints</a><br/>
-4. <a href="#implementing.actions">Implementing Actions</a><br/>
-5. <a href="#creating.categories">Creating Categories</a><br/>
-6. <a href="#decorating">Decorating</a><br/>
-7. <a href="#adding.wizard.pages">Adding Wizard Pages</a><br/>
-8. <a href="#defining.presets">Defining Presets</a><br/>
-9. <a href="#runtime.mappings">Specifying Runtime Support Mappings</a><br/>
-10. <a href="#summary">Summary</a><br/>
-Appendix A: <a href="#custom.version.comparators">Custom Version Comparators</a><br/>
-Appendix B: <a href="#version.expressions">Version Expressions</a><br/>
-Appendix C: <a href="#event.handlers">Event Handlers</a><br/>
-Appendix D: <a href="#property.tester">Property Tester</a><br/>
-Appendix E: <a href="#wizard.context">Wizard Context</a><br/>
-</div>
-
-<h2><a name="getting.started">1. Getting Started</a></h2>
-
-<p>To follow along with this tutorial, you will need to have a working install 
-of Web Tools Platform v1.5. The tutorial is not designed to be used with 1.0.x
-version of WTP as there are numerous extension point and API differences. You 
-can download the install kits for WTP and its prerequisites, including Eclipse 
-Platform v3.2, at the following locations:</p>
-
-<ul>
-  <li><a href="http://download.eclipse.org/eclipse/downloads/">Eclipse Platform Download Site</a></li>
-  <li><a href="http://download.eclipse.org/webtools/downloads/">Web Tools Platform Download Site</a></li>
-</ul>
-
-<p>Once the required software has been installed you will need to
-create a new workspace and add the <a href="materials/starter.zip">starter project</a>
-to it. The starter project includes the materials and utility code that will
-be used in this tutorial. If you get stuck at any point you can take a peek at
-the <a href="materials/solution.zip">solution project</a>.</p>
-
-<h2><a name="creating.basic.facets">2. Creating Basic Facet Definitions</a></h2>
-
-<p>Project facets are declared via the <code>org.eclipse.wst.common.project.facet.core.facets</code>
-extension point. This is a pretty large extension point with lots of facilities,
-but we will start small and progress incrementally while building the tutorial
-facets. Here is the part of the schema that we will be working with initially:</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;
-
-  &lt;project-facet id="<span class="schema-type">{string}</span>"&gt; <span class="schema-control">(0 or more)</span>
-    &lt;label&gt;<span class="schema-type">{string}</span>&lt;/label&gt;
-    &lt;description&gt;<span class="schema-type">{string}</span>&lt;/description&gt; <span class="schema-control">(optional)</span>
-  &lt;/project-facet&gt;
-
-  &lt;project-facet-version facet="<span class="schema-type">{string}</span>" version="<span class="schema-type">{string}</span>"/&gt; <span class="schema-control">(0 or more)</span>
-  
-&lt;/extension&gt;</pre>
-</div>
-
-<p>As you can see, there are two top-level elements in this part of the extension
-point schema. The <code>&lt;project-facet&gt;</code> element is used to declare
-the facet itself. The <code>&lt;project-facet-version&gt;</code> element is used
-to declare versions of the facet. Every facet implementation needs to provide
-at least one facet version declaration. In fact, as you will see later in this
-tutorial, the bulk of the work happens in the <code>&lt;project-facet-version&gt;</code>
-declaration. For now all you need to remember is that a facet cannot be used
-unless it has at least one version.</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="<span class="code-text">org.eclipse.wst.common.project.facet.core.facets</span>"&gt;
-
-  &lt;project-facet id="<span class="code-text">formgen.core</span>"&gt;
-    &lt;label&gt;<span class="code-text">FormGen Core</span>&lt;/label&gt;
-    &lt;description&gt;
-      <span class="code-text">Enables generation of HTML forms based on XML definition files.</span>
-    &lt;/description&gt;
-  &lt;/project-facet&gt;
-
-  &lt;project-facet-version facet="<span class="code-text">formgen.core</span>" version="<span class="code-text">1.0</span>"/&gt;
-
-  &lt;project-facet id="<span class="code-text">formgen.ext</span>"&gt;
-    &lt;label&gt;<span class="code-text">FormGen Extensions</span>&lt;/label&gt;
-    &lt;description&gt;
-      <span class="code-text">Enables additional FormGen widgets.</span>
-    &lt;/description&gt;
-  &lt;/project-facet&gt;
-
-  &lt;project-facet-version facet="<span class="code-text">formgen.ext</span>" version="<span class="code-text">1.0</span>"/&gt;
-  
-&lt;/extension&gt;</pre>
-</div>
-
-<p>Insert the above code into your plugin.xml file and lets see it in action.
-Launch Eclipse with your FormGen plugin and then open the Dynamic Web Project
-wizard. Make sure that <code>&lt;none&gt;</code> is selected in the Target Runtime
-field on the first page and go to the second page. You should see a screen that
-looks like the following. Note that the FormGen facets that you have created
-are displayed.</p>
-
-<div class="screen-shot"><img src="images/screen01.gif"/></div>
-
-<h2><a name="specifying.constraints">3. Specifying Constraints</a></h2>
-
-<p>One of the problems with what we have so far is that the FormGen facets
-appear in other module project wizards such as the EJB Project Wizard. That, of
-course, makes no sense since FormGen is servlet-based technology and so is only
-applicable to J2EE web applications. To solve this problem we will use the 
-constraint mechanism to specify the dependencies.</p>
-
-<p>Here is what that part of the extension point schema looks like:</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;
-  &lt;project-facet-version&gt;</span>
-    &lt;constraint&gt; <span class="schema-control">(optional)</span>
-      <span class="schema-control">[expr]</span>
-    &lt;/constraint&gt;
-  <span class="context-code">&lt;/project-facet-version&gt;
-&lt;/extension&gt;</span>
-
-<span class="schema-control">[expr] =</span>
-  &lt;requires facet="<span class="schema-type">{string}</span>" version="<span class="schema-type"><span class="schema-type-link">{<a href="#version.expressions">version.expr</a>}</span></span>" soft="<span class="schema-type">{boolean}</span>"/&gt; <span class="schema-control">or</span>
-  &lt;conflicts facet="<span class="schema-type">{string}</span>" version="<span class="schema-type"><span class="schema-type-link">{<a href="#version.expressions">version.expr</a>}</span></span>"/&gt; <span class="schema-control">or</span>
-  &lt;conflicts group="<span class="schema-type">{string}</span>"/&gt; <span class="schema-control">or</span>
-  &lt;and&gt;
-    <span class="schema-control">[expr]</span> <span class="schema-control">(1 or more)</span>
-  &lt;/and&gt; <span class="schema-control">or</span>
-  &lt;or&gt;
-    <span class="schema-control">[expr]</span> <span class="schema-control">(1 or more)</span>
-  &lt;/or&gt;</pre>
-</div>
-
-<p>As you can see, the constraint is an expression tree and you have four
-operators at your disposal. Lets go over them one by one.</p>
-
-<div style="margin-left: 10px">
-<p><b>requires</b></p>
-
-<p>The <code>requires</code> operator is the most frequently used of all the operators. 
-It is used to specify a dependency on another facet. If the <code>version</code>
-attribute is not specified, any version of the referenced facet will satisfy
-the constraint. If only specific versions will do, the <code>version</code> 
-attribute can contain a <a href="#version.expressions">version expression</a>.</p>
-
-<p>The <code>soft</code> attribute is used to create a special kind of a
-dependency. Facet selection will not be prevented if the dependency is not
-met, but if the dependency is met, the facet is guaranteed to be installed
-after the referenced facet.</p>
-
-<p><b>conflicts</b></p>
-
-<p>The <code>conflicts</code> constraint is used to indicate that the declaring
-facet will not work correctly if installed into the same project as referenced
-facets. The <code>conflicts</code> constraint comes in two flavors. You can
-either specify a conflict with a single facet or with a group of facets.</p>
-
-<p>What are groups of facets? Facet groups are a way to designate a conflict with
-a certain class of facets without having to list all of the facets explicitly.
-For instance, the WTP module facets all belong to the "modules" group. They also
-each declare a conflict with the "modules" group. This prevents two module facets
-from being installed into the same project. By declaring a conflict with a
-group whose membership can expand as necessary, third parties can add module
-facets on top of WTP and have the new facets interact correctly with the
-built-in module facets.</p>
-
-<p>A facet group is created the first time a facet declares group membership.
-Here is the extension point schema for declaring group membership:</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;
-  &lt;project-facet-version&gt;</span>
-    &lt;group-member id="<span class="schema-type">{string}</span>"/&gt; <span class="schema-control">(0 or more)</span>
-  <span class="context-code">&lt;/project-facet-version&gt;
-&lt;/extension&gt;</span>
-</pre>
-</div>
-
-<p><b>and &amp; or</b>
-
-<p>The <code>and</code> &amp; <code>or</code> constraints are used to perform 
-logical conjunction and disjunction over their operands. Although it is legal
-for these operators to have only one operand, typically they will have two or
-more.</p>
-</div>
-
-<p>We can now specify the constraints for the FormGen facets. The facet id that
-marks a project as a J2EE web module is <code>jst.web</code>. We will setup
-a dependency on it from the <code>formgen.core</code> facet. The
-<code>formgen.ext</code> facet can then depend on the <code>formgen.ext</code>
-facet. That latter constraint will ensure that the FormGen Extensions
-are not installed without installing FormGen Core.</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;
-
-  &lt;project-facet-version id="formgen.core" version="1.0"&gt;</span>
-    &lt;constraint&gt;
-      &lt;requires facet="<span class="xml-text">jst.web</span>" version="<span class="xml-text">2.2,2.3,2.4</span>"/&gt;
-    &lt;/constraint&gt;
-  <span class="context-code">&lt;/project-facet&gt;
-
-  &lt;project-facet-version id="formgen.ext" version="1.0"&gt;</span>
-    &lt;constraint&gt;
-      &lt;requires facet="<span class="xml-text">formgen.core</span>" version="<span class="xml-text">1.0</span>"/&gt;
-    &lt;/constraint&gt;
-  <span class="context-code">&lt;/project-facet&gt;
-  
-&lt;/extension&gt;</span></pre>
-</div>
-
-<p>Once the above code is added, the FormGen facets should only appear in the
-Dynamic Web Project wizard.</p>
-
-<h2><a name="implementing.actions">4. Implementing Actions</a></h2>
-
-<p>Let's now try selecting the FormGen Core facet on the facets selection page
-of the Dynamic Web Project wizard. If you do that, you should see the
-following error message appear.</p>
-
-<div class="screen-shot"><img src="images/screen02.gif"/></div>
-
-<p>This error message is displayed because the install action has not been
-implemented for this facet. What's an action? An action is an operation that a
-user can perform on a facet. There are three action types <code>INSTALL</code>,
-<code>UNINSTALL</code>, and <code>VERSION_CHANGE</code>. We will now implement
-the install actions for the FormGen facets.</p>
-
-<p>Here is what that part of the extension point schema looks like:</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;</span>
-  &lt;action id="<span class="schema-type">{string}</span>" facet="<span class="schema-type">{string}</span>" version="<span class="schema-type"><span class="schema-type-link">{<a href="#version.expressions">version.expr</a>}</span></span>" type="<span class="schema-type">INSTALL|UNINSTALL|VERSION_CHANGE</span>"&gt;
-    &lt;delegate class="<span class="schema-type">{class:org.eclipse.wst.common.project.facet.core.IDelegate}</span>"/&gt;
-    &lt;property name="<span class="schema-type">{string}</span>" value="<span class="schema-type">{string}</span>"/&gt; <span class="schema-control">(0 or more)</span>
-  &lt;/action&gt;
-<span class="context-code">&lt;/extension&gt;</span>
-</pre>
-</div>
-
-<ul>
-
-  <li><p>The version attribute can contain a single version or a <a href="#version.expressions">version expression</a>.
-    It can also be omitted if the action applies to all versions of the facet.</p></li>
-    
-  <li><p>The <code>id</code> attribute is optional. If not specified, the framework
-    will automatically generate one using the following pattern:</p>
-    <p><code>[facet-id]#[version-expression]#[action-type](#[prop-name]=[prop-value])*</code></p>
-    <p>As you can see, it is better to provide an explicit id rather than letting
-    the framework generate it. Later in the tutorial we will cover extension
-    points that make references to action ids.</p>
-  
-  <li><p>The <code>&lt;action&gt;</code> element can also be embeded inside the
-    <code>&lt;project-facet-version&gt;</code> element. In that case, the
-    <code>facet</code> and <code>version</code> attributes should be omitted.
-    Note that if the same delegate implementation applies to multiple facet 
-    versions, it is better to provide a single action declaration externally.
-    This allows the framework to perform certain kinds of optimizations</p></li>
-    
-  <li><p>For the <code>VERSION_CHANGE</code> action, it is possible to restrict
-    the applicability of the action definition with regards to the starting
-    version. To do that, simply specify "from.versions" property in the action
-    definition. The value is a <a href="#version.expressions">version expression</a>.
-    If this property is not specified, the framework will assume that the delegate
-    is capable of converting from any starting version.</p></li>
-    
-</ul>
-
-<div class="code">
-<pre class="java-code"><span class="java-keyword">package</span> org.eclipse.wst.common.project.facet.core;
-
-<span class="java-keyword">import</span> org.eclipse.core.resources.IProject;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.CoreException;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.IProgressMonitor;
-
-<span class="java-comment">/**
- * This interface is implemented in order to provide logic associated with
- * a particular event in project facet's life cycle, such as install or 
- * uninstall.
- */</span>
-
-<span class="java-keyword">public interface</span> IDelegate 
-{
-    <span class="java-comment">/**
-     * The method that's called to execute the delegate.
-     * 
-     * <span class="java-javadoc-keyword">@param</span> project the workspace project
-     * <span class="java-javadoc-keyword">@param</span> fv the project facet version that this delegate is handling; this
-     *   is useful when sharing the delegate among several versions of the same
-     *   project facet or even different project facets
-     * <span class="java-javadoc-keyword">@param</span> config the configuration object, or <code>null</code> if defaults
-     *   should be used
-     * <span class="java-javadoc-keyword">@param</span> monitor the progress monitor
-     * <span class="java-javadoc-keyword">@throws</span> CoreException if the delegate fails for any reason
-     */</span>
-    
-    <span class="java-keyword">void</span> execute( IProject project,
-                  IProjectFacetVersion fv,
-                  Object config,
-                  IProgressMonitor monitor )
-    
-        <span class="java-keyword">throws</span> CoreException;
-}
-</pre>
-</div>
-
-<p>Let's now dive in and implement the install delegates for the FormGen facets.
-The <code>formgen.core</code> facet should (a) copy <code>formgen-core.jar</code>
-into the project's <code>WEB-INF/lib</code> directory, and (b) register the
-FormGen servlet in <code>web.xml</code>. The <code>formgen.ext</code> facet should
-copy the <code>formgen-ext.jar</code> into the project's <code>WEB-INF/lib</code>
-directory.</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;</span>
-
-  <span class="context-code">&lt;project-facet-version facet="formgen.core" version="1.0"&gt;</span>
-    &lt;action type="<span class="xml-text">INSTALL</span>"&gt;
-      &lt;delegate class="<span class="xml-text">com.formgen.eclipse.FormGenCoreFacetInstallDelegate</span>"/&gt;
-    &lt;/action&gt;
-  <span class="context-code">&lt;/project-facet-version&gt;</span>
-
-  <span class="context-code">&lt;project-facet-version facet="formgen.ext" version="1.0"&gt;</span>
-    &lt;action type="<span class="xml-text">INSTALL</span>"&gt;
-      &lt;delegate class="<span class="xml-text">com.formgen.eclipse.FormGenExtFacetInstallDelegate</span>"/&gt;
-    &lt;/action&gt;
-  <span class="context-code">&lt;/project-facet-version&gt;</span>
-  
-<span class="context-code">&lt;/extension&gt;</span>
-</pre>
-</div>
-
-<div class="code">
-<pre class="java-code"><span class="java-keyword">package</span> com.formgen.eclipse;
-
-<span class="java-keyword">import</span> org.eclipse.core.resources.IFolder;
-<span class="java-keyword">import</span> org.eclipse.core.resources.IProject;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.CoreException;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.IProgressMonitor;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.Path;
-<span class="java-keyword">import</span> org.eclipse.wst.common.project.facet.core.IDelegate;
-<span class="java-keyword">import</span> org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-<span class="java-keyword">public final class</span> FormGenCoreFacetInstallDelegate <span class="java-keyword">implements</span> IDelegate
-{
-    <span class="java-keyword">public void</span> execute( <span class="java-keyword">final</span> IProject pj,
-                         <span class="java-keyword">final</span> IProjectFacetVersion fv,
-                         <span class="java-keyword">final</span> Object config,
-                         <span class="java-keyword">final</span> IProgressMonitor monitor )
-
-        <span class="java-keyword">throws</span> CoreException
-
-    {
-        monitor.beginTask( "", 2 );
-
-        <span class="java-keyword">try</span>
-        {
-            <span class="java-keyword">final</span> IFolder webInfLib = Utils.getWebInfLibDir( pj );
-
-            Utils.copyFromPlugin( new Path( "libs/formgen-core.jar" ),
-                                  webInfLib.getFile( "formgen-core.jar" ) );
-
-            monitor.worked( 1 );
-
-            Utils.registerFormGenServlet( pj );
-
-            monitor.worked( 1 );
-        }
-        <span class="java-keyword">finally</span>
-        {
-            monitor.done();
-        }
-    }
-}
-</pre>
-</div>
-
-<div class="code">
-<pre class="java-code"><span class="java-keyword">package</span> com.formgen.eclipse;
-
-<span class="java-keyword">import</span> org.eclipse.core.resources.IFolder;
-<span class="java-keyword">import</span> org.eclipse.core.resources.IProject;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.CoreException;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.IProgressMonitor;
-<span class="java-keyword">import</span> org.eclipse.core.runtime.Path;
-<span class="java-keyword">import</span> org.eclipse.wst.common.project.facet.core.IDelegate;
-<span class="java-keyword">import</span> org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-<span class="java-keyword">public final class</span> FormGenExtFacetInstallDelegate <span class="java-keyword">implements</span> IDelegate
-{
-    <span class="java-keyword">public void</span> execute( <span class="java-keyword">final</span> IProject pj,
-                         <span class="java-keyword">final</span> IProjectFacetVersion fv,
-                         <span class="java-keyword">final</span> Object config,
-                         <span class="java-keyword">final</span> IProgressMonitor monitor )
-
-        <span class="java-keyword">throws</span> CoreException
-
-    {
-        monitor.beginTask( "", 1 );
-
-        <span class="java-keyword">try</span>
-        {
-            <span class="java-keyword">final</span> IFolder webInfLib = Utils.getWebInfLibDir( pj );
-
-            Utils.copyFromPlugin( new Path( "libs/formgen-ext.jar" ),
-                                  webInfLib.getFile( "formgen-ext.jar" ) );
-
-            monitor.worked( 1 );
-        }
-        <span class="java-keyword">finally</span>
-        {
-            monitor.done();
-        }
-
-    }
-}
-</pre>
-</div>
-
-<p>Once the install actions have been implemented, you should be able to select
-the FormGen facets on the Facets Selection Page of the Dynamic Web Project Wizard
-without getting any error messages. You should also be able to complete the
-project creation and see the following highlighted artifacts in the new project.
-These artifacts have been created by the FormGen facet install delegates.</p>
-
-<div class="screen-shot"><img src="images/screen03.gif"/></div>
-
-<h2><a name="creating.categories">5. Creating Categories</a></h2>
-
-<p>Project facets can be grouped into categories in order to provide the "one
-click" exprience for novice users and retain the fine-grained control for advanced 
-users. You are told that most of FormGen users always add both of the jars to
-their web apps. These users would benefit from having the FormGen facets grouped
-into a category and so we will do just that.</p>
-
-<p>Here is what that part of the extension point schema looks like:</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;</span>
-  &lt;category id="<span class="schema-type">{string}</span>"&gt;
-    &lt;label&gt;<span class="schema-type">{string}</span>&lt;/label&gt;
-    &lt;description&gt;<span class="schema-type">{string}</span>&lt;/description&gt; <span class="schema-control">(optional)</span>
-  &lt;/category&gt;
-  <span class="context-code">&lt;project-facet&gt;</span>
-    &lt;category&gt;<span class="schema-type">{string}</span>&lt;/category&gt; <span class="schema-control">(optional)</span>
-  <span class="context-code">&lt;/project-facet&gt;</span>
-<span class="context-code">&lt;/extension&gt;</span>
-</pre>
-</div>
-
-<p>We can now create a category around the FormGen facets.</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;</span>
-
-  &lt;category id="<span class="schema-type">formgen.category</span>"&gt;
-    &lt;label&gt;<span class="schema-type">FormGen</span>&lt;/label&gt;
-    &lt;description&gt;<span class="schema-type">Enables generation of HTML forms based on XML definition files.</span>&lt;/description&gt;
-  &lt;/category&gt;
-
-  <span class="context-code">&lt;project-facet id="formgen.core"&gt;</span>
-    &lt;category&gt;<span class="schema-type">formgen.category</span>&lt;/category&gt;
-  <span class="context-code">&lt;/project-facet&gt;</span>
-
-  <span class="context-code">&lt;project-facet id="formgen.ext"&gt;</span>
-    &lt;category&gt;<span class="schema-type">formgen.category</span>&lt;/category&gt;
-  <span class="context-code">&lt;/project-facet&gt;</span>
-
-<span class="context-code">&lt;/extension&gt;</span>
-</pre>
-</div>
-
-<p>Once the above change has been put in place, the facets selection page should 
-look like this:</p>
-
-<div class="screen-shot"><img src="images/screen04.gif"/></div>
-
-<h2><a name="decorating">6. Decorating</a></h2>
-
-<p>Custom icons can be provided for facets and categories. If an icon is not
-provided, a default icon is used. The icons are helpful as a way to better
-differentiate facets and to make them stand out.</p>
-
-<p>Here is what that extension point looks like:</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="org.eclipse.wst.common.project.facet.ui.images"&gt;
-  &lt;image facet="<span class="schema-type">{string}</span>" path="<span class="schema-type">{string}</span>"/&gt; <span class="schema-control">(0 or more)</span>
-  &lt;image category="<span class="schema-type">{string}</span>" path="<span class="schema-type">{string}</span>"/&gt; <span class="schema-control">(0 or more)</span>
-&lt;/extension&gt;
-</pre>
-</div>
-
-<p>Your starter project came with three icons in the <code>icons</code> folder.
-We will now associate them with the FormGen facets and the category.</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="<span class="xml-text">org.eclipse.wst.common.project.facet.ui.images</span>"&gt;
-  &lt;image facet="<span class="xml-text">formgen.core</span>" path="<span class="xml-text">icons/formgen-core.gif</span>"/&gt;
-  &lt;image facet="<span class="xml-text">formgen.ext</span>" path="<span class="xml-text">icons/formgen-ext.gif</span>"/&gt;
-  &lt;image category="<span class="xml-text">formgen.category</span>" path="<span class="xml-text">icons/formgen-cat.gif</span>"/&gt;
-&lt;/extension&gt;
-</pre>
-</div>
-
-<p>Once the above snippet has been added to your plugin.xml file, the facets
-selection page should look like this:</p>
-
-<div class="screen-shot"><img src="images/screen05.gif"/></div>
-
-<h2><a name="adding.wizard.pages">7. Adding Wizard Pages</a></h2>
-
-<p>It is often desirable to gather user input prior to installing a facet.
-The framework allows a sequence of wizard pages to be associated with facet
-actions. The supplied wizard pages are shown after the facets selection
-page. Based on user feedback, you known that FormGen users often customize
-the URL pattern of the FormGen servlet so you would like to give them the ability
-to do that in the wizard when the FormGen facets are being installed.</p>
-
-<p>Here is what the relevant parts of the extension points look like:</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;
-  &lt;action&gt;</span>
-    &lt;config-factory class="<span class="schema-type">class:org.eclipse.wst.common.project.facet.core.IActionConfigFactory</span>"/&gt;
-  <span class="context-code">&lt;/action&gt;
-&lt;/extension&gt;</span>
-
-&lt;extension point="<span class="xml-text">org.eclipse.wst.common.project.facet.ui.wizardPages</span>"&gt;
-  &lt;wizard-pages action="<span class="schema-type">{string}</span>"&gt; <span class="schema-control">(0 or more)</span>
-    &lt;page class="<span class="schema-type">{class:org.eclipse.wst.common.project.facet.ui.IFacetWizardPage}</span>"/> <span class="schema-control">(1 or more)</span>
-  &lt;/wizard-pages&gt;
-&lt;/extension&gt;  
-</pre>
-</div>
-
-<p>One thing to note here is that in order to enable communication between the
-facet action delegate and the wizard pages, we go back to the action declaration
-and provide an action config factory. The object created by the factory is 
-populated by the wizard pages and is read by the action delegate. No restrictions
-are placed on the shape of the config object. You may choose to implement a custom
-class or you can use a something generic like <code>java.util.HashMap</code>.</p>
-
-<p>Another thing to note is that the <code>wizardPages</code> extension point refers
-to the actions by their ids, so it becomes more important to explicitly specify
-the id rather than letting the framework automatically generate one.</p>
-
-<p>Here are the interfaces that are used in the above extension point schema:</p> 
-
-<div class="code">
-<pre class="java-code"><span class="java-keyword">package</span> org.eclipse.wst.common.project.facet.core;
-
-<span class="java-keyword">import</span> org.eclipse.core.runtime.CoreException;
-
-<span class="java-comment">/**
- * This interface is implemented in order to provide a method for creating 
- * a config object that will be used for parameterizing the facet action
- * delegate.
- */</span>
-
-<span class="java-keyword">public interface</span> IActionConfigFactory
-{
-    <span class="java-comment">/**
-     * Creates a new facet action configuration object. The new configuration
-     * object should ideally be populated with reasonable defaults.
-     * 
-     * <span class="java-javadoc-keyword">@return</span> a new facet action configuration object
-     * <span class="java-javadoc-keyword">@throws</span> CoreException if failed while creating the configuration object
-     */</span>
-    
-    Object create() <span class="java-keyword">throws</span> CoreException;
-}
-</pre>
-</div>
-
-<div class="code">
-<pre class="java-code"><span class="java-keyword">package</span> org.eclipse.wst.common.project.facet.ui;
-
-<span class="java-keyword">import</span> org.eclipse.jface.wizard.IWizardPage;
-
-<span class="java-comment">/**
- * This interface is implemented by the wizard pages associated with project
- * facet actions.
- */</span>
-
-<span class="java-keyword">public interface</span> IFacetWizardPage <span class="java-keyword">extends</span> IWizardPage
-{
-    <span class="java-comment">/**
-     * The framework will call this method in order to provide the wizard
-     * context to the wizard page. The wizard context can be used to find out
-     * about other actions being configured by the wizard.
-     * 
-     * <span class="java-javadoc-keyword">@param</span> context the wizard context
-     */</span>
-    
-    <span class="java-keyword">void</span> setWizardContext( IWizardContext context );
-    
-    <span class="java-comment">/**
-     * The framework will call this method in order to provide the action config
-     * object that the wizard page should save user selection into. The
-     * populated config object will then be passed to the action delegate.
-     * 
-     * <span class="java-javadoc-keyword">@param</span> config the action config object
-     */</span>
-    
-    <span class="java-keyword">void</span> setConfig( Object config );
-    
-    <span class="java-comment">/**
-     * This method is called after the user has pressed the <code>Finish</code>
-     * button. It allows the wizard page to transfer user selection into the
-     * config object. Alternative, instead of using this method, the wizard
-     * page could update the model on the fly as the user is making changes.
-     */</span>
-
-    <span class="java-keyword">void</span> transferStateToConfig();
-}
-</pre>
-</div>
-
-<p>We will now implement a wizard page for the <code>facet.core</code> facet
-install action. The wizard page will allow the user to change the default
-servlet URL pattern for the FormGen servlet.</p>
-
-<div class="code">
-<pre class="code-xml"><span class="context-code">&lt;extension point="org.eclipse.wst.common.project.facet.core.facets"&gt;
-  &lt;project-facet-version facet="formgen.core" version="1.0"&gt;
-    &lt;action type="INSTALL"</span> id="<span class="xml-text">formgen.core.install</span>"<span class="context-code">&gt;</span>
-      &lt;config-factory class="<span class="xml-text">com.formgen.eclipse.FormGenCoreFacetInstallConfig$Factory</span>"/&gt;
-    <span class="context-code">&lt;/action&gt;
-  &lt;/project-facet-version&gt;
-&lt;/extension&gt;</span>
-
-&lt;extension point="<span class="xml-text">org.eclipse.wst.common.project.facet.ui.wizardPages</span>"&gt;
-  &lt;wizard-pages action="<span class="xml-text">formgen.core.install</span>"&gt;
-    &lt;page class="<span class="schema-type">com.formgen.eclipse.FormGenCoreFacetInstallPage</span>"/>
-  &lt;/wizard-pages&gt;
-&lt;/extension&gt;  
-</pre>
-</div>
-
-<div class="code">
-<pre class="java-code"><span class="java-keyword">package</span> com.formgen.eclipse;
-
-<span class="java-keyword">import</span> org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
-
-<span class="java-keyword">public final class</span> FormGenCoreFacetInstallConfig
-{
-    <span class="java-keyword">private</span> String urlPattern = <span class="java-literal">"*.form"</span>;
-
-    <span class="java-keyword">public</span> String getUrlPattern()
-    {
-        <span class="java-keyword">return this</span>.urlPattern;
-    }
-
-    <span class="java-keyword">public void</span> setUrlPattern( <span class="java-keyword">final</span> String urlPattern )
-    {
-        <span class="java-keyword">this</span>.urlPattern = urlPattern;
-    }
-
-    <span class="java-keyword">public static final class</span> Factory <span class="java-keyword">implements</span> IActionConfigFactory
-    {
-        <span class="java-keyword">public</span> Object create()
-        {
-            <span class="java-keyword">return new</span> FormGenCoreFacetInstallConfig();
-        }
-    }
-}
-</pre>
-</div>
-
-<div class="code">
-<pre class="java-code"><span class="java-keyword">package</span> com.formgen.eclipse;
-
-<span class="java-keyword">import</span> org.eclipse.swt.SWT;
-<span class="java-keyword">import</span> org.eclipse.swt.layout.GridData;
-<span class="java-keyword">import</span> org.eclipse.swt.layout.GridLayout;
-<span class="java-keyword">import</span> org.eclipse.swt.widgets.Composite;
-<span class="java-keyword">import</span> org.eclipse.swt.widgets.Label;
-<span class="java-keyword">import</span> org.eclipse.swt.widgets.Text;
-<span class="java-keyword">import</span> org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
-
-<span class="java-keyword">public final class</span> FormGenCoreFacetInstallPage <span class="java-keyword">extends</span> AbstractFacetWizardPage
-{
-    <span class="java-keyword">private</span> FormGenCoreFacetInstallConfig config;
-    <span class="java-keyword">private</span> Text urlPatternTextField;
-
-    <span class="java-keyword">public</span> FormGenCoreFacetInstallPage()
-    {
-        <span class="java-keyword">super</span>( <span class="java-literal">"formgen.core.facet.install.page"</span> );
-
-        setTitle( <span class="java-literal">"FormGen Core"</span> );
-        setDescription( <span class="java-literal">"Configure the FormGen servlet."</span> );
-    }
-
-    <span class="java-keyword">public void</span> createControl( <span class="java-keyword">final</span> Composite parent )
-    {
-        <span class="java-keyword">final</span> Composite composite = <span class="java-keyword">new</span> Composite( parent, SWT.NONE );
-        composite.setLayout( <span class="java-keyword">new</span> GridLayout( 1, <span class="java-keyword">false</span> ) );
-
-        <span class="java-keyword">final</span> Label label = <span class="java-keyword">new</span> Label( composite, SWT.NONE );
-        label.setLayoutData( gdhfill() );
-        label.setText( <span class="java-literal">"URL Pattern:"</span> );
-
-        <span class="java-keyword">this</span>.urlPatternTextField = <span class="java-keyword">new</span> Text( composite, SWT.BORDER );
-        <span class="java-keyword">this</span>.urlPatternTextField.setLayoutData( gdhfill() );
-        <span class="java-keyword">this</span>.urlPatternTextField.setText( this.config.getUrlPattern() );
-
-        setControl( composite );
-    }
-
-    <span class="java-keyword">public void</span> setConfig( <span class="java-keyword">final</span> Object config )
-    {
-        <span class="java-keyword">this</span>.config = (FormGenCoreFacetInstallConfig) config;
-    }
-
-    <span class="java-keyword">public void</span> transferStateToConfig()
-    {
-        <span class="java-keyword">this</span>.config.setUrlPattern( <span class="java-keyword">this</span>.urlPatternTextField.getText() );
-    }
-
-    <span class="java-keyword">private static</span> GridData gdhfill()
-    {
-        <span class="java-keyword">return new</span> GridData( GridData.FILL_HORIZONTAL );
-    }
-}
-</pre>
-</div>
-
-<div class="code">
-<pre class="java-code"><span class="java-context"><span class="java-context-keyword">package</span> com.formgen.eclipse;
-
-<span class="java-context-keyword">import</span> org.eclipse.core.resources.IFolder;
-<span class="java-context-keyword">import</span> org.eclipse.core.resources.IProject;
-<span class="java-context-keyword">import</span> org.eclipse.core.runtime.CoreException;
-<span class="java-context-keyword">import</span> org.eclipse.core.runtime.IProgressMonitor;
-<span class="java-context-keyword">import</span> org.eclipse.core.runtime.Path;
-<span class="java-context-keyword">import</span> org.eclipse.wst.common.project.facet.core.IDelegate;
-<span class="java-context-keyword">import</span> org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-<span class="java-context-keyword">public final class</span> FormGenCoreFacetInstallDelegate <span class="java-context-keyword">implements</span> IDelegate
-{
-    <span class="java-context-keyword">public void</span> execute( <span class="java-context-keyword">final</span> IProject pj,
-                         <span class="java-context-keyword">final</span> IProjectFacetVersion fv,
-                         <span class="java-context-keyword">final</span> Object config,
-                         <span class="java-context-keyword">final</span> IProgressMonitor monitor )
-
-        <span class="java-context-keyword">throws</span> CoreException
-
-    {
-        monitor.beginTask( "", 2 );
-
-        try
-        {</span>
-            <span class="java-keyword">final</span> FormGenCoreFacetInstallConfig cfg
-                = (FormGenCoreFacetInstallConfig) config;
-
-            <span class="java-context"><span class="java-context-keyword">final</span> IFolder webInfLib = Utils.getWebInfLibDir( pj );
-
-            Utils.copyFromPlugin( <span class="java-context-keyword">new</span> Path( "libs/formgen-core.jar" ),
-                                  webInfLib.getFile( "formgen-core.jar" ) );
-
-            monitor.worked( 1 );</span>
-
-            Utils.registerFormGenServlet( pj, cfg.getUrlPattern() );
-
-            <span class="java-context">monitor.worked( 1 );
-        }
-        <span class="java-context-keyword">finally</span>
-        {
-            monitor.done();
-        }
-    }
-}</span>
-</pre>
-</div>
-
-<p>Once the above code changes have been made you should see another page appear
-in the Dynamic Web Project Wizard after the FormGen facets are selected. The
-new page will appear after the Web Module page, which is associated with the
-<code>jst.web</code> facet. That's because <code>formgen.core</code> facet
-depends on the <code>jst.web</code> facet. If this dependency relationship 
-was not specified the relative order of these pages would be unspecified.</p>
-
-<div class="screen-shot"><img src="images/screen06.gif"/></div>
-
-<h2><a name="defining.presets">8. Defining Presets</a></h2>
-
-<p>As the number of available facets grows, it becomes increasingly difficult
-for the user to figure out which combinations make sense. This is where presets
-come in. Presets (or Configurations, as they are referred to in the UI) are
-simply combinations of facets that someone has determined are useful in certain
-situations. Presets can be created by the user or supplied via an extension
-point.</p>
-
-<p>Here is the extension point schema for declaring presets:</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="<span class="xml-text">org.eclipse.wst.common.project.facet.core.facets</span>"&gt;
-  &lt;preset id="<span class="schema-type">{string}</span>"&gt;
-    &lt;label&gt;<span class="schema-type">{string}</span>&lt;/label&gt;
-    &lt;description&gt;<span class="schema-type">{string}</span>&lt;/description&gt; <span class="schema-control">(optional)</span>
-    &lt;facet id="<span class="schema-type">{string}</span>" version="<span class="schema-type">{string}</span>"/&gt; <span class="schema-control">(1 or more)</span>
-  &lt;/preset&gt;
-&lt;/extension&gt;
-</pre>
-</div>
-
-<p>Note that in order for a preset to apply to a given faceted project, the
-preset needs to include all of the project's "fixed facets". Fixed facets are
-the facets that are key to the proper operation of that project type and so
-cannot be removed. You can identify fixed facets by the lock icon.</p>
-
-<p>Let's now create a preset that includes formgen facets.</p>
-
-<div class="code">
-<pre class="code-xml">&lt;extension point="<span class="xml-text">org.eclipse.wst.common.project.facet.core.facets</span>"&gt;
-  &lt;preset id="<span class="xml-text">formgen.preset</span>"&gt;
-    &lt;label&gt;<span class="xml-text">FormGen Web Project</span>&lt;/label&gt;
-    &lt;description&gt;<span class="xml-text">Creates a web project with FormGen functionality.</span>&lt;/description&gt;
-    &lt;facet id="<span class="xml-text">jst.java</span>" version="<span class="xml-text">5.0</span>"/&gt;
-    &lt;facet id="<span class="xml-text">jst.web</span>" version="<span class="xml-text">2.2</span>"/&gt;
-    &lt;facet id="<span class="xml-text">formgen.core</span>" version="<span class="xml-text">1.0</span>"/&gt;
-    &lt;facet id="<span class="xml-text">formgen.ext</span>" version="<span class="xml-text">1.0</span>"/&gt;
-  &lt;/preset&gt;
-&lt;/extension&gt;
-</pre>
-</div>
-
-<p>Here is how the preset shows up on the facets selection page:</p>
-
-<div class="screen-shot"><img src